Mercurial > tote

changeset 199:e3130545a566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in veverak/tote/veverak/servosino-edited-no-need-for-minmax-magi-1450691089896 (pull request #1) servos.ino edited, no need for min/max magic with constrain :)
author Radomir Dopieralski <bitbucket@sheep.art.pl>
date Mon, 21 Dec 2015 10:49:31 +0100
parents e70d0fba0fc9 (current diff) ebcabf0863dc (diff)
children c4a2d90ad57f
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/i2cslave/servos.ino	Sat Nov 21 16:54:40 2015 +0100
+++ b/i2cslave/servos.ino	Mon Dec 21 10:49:31 2015 +0100
@@ -65,9 +65,10 @@
     }
     int freq = (SERVO_FREQ_MAX -
                 SERVO_FREQ_MIN) * rads / PI + SERVO_FREQ_MIN;
-    freq = min(SERVO_FREQ_MAX,
-               max(SERVO_FREQ_MIN,
-                   freq + SERVO_TRIM[servo] * 10));
+    freq = constrain(freq + SERVO_TRIM[servo] * 10, 
+                     SERVO_FREQ_MIN,
+                     SERVO_FREQ_MAX);
+
     servos[servo].writeMicroseconds(freq);
 }