Mercurial > tote

changeset 203:c4a2d90ad57f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Wed, 07 Dec 2016 21:10:42 +0100
parents a75e02f9c15a (current diff) e3130545a566 (diff)
children 0a8c78f1842b
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/i2cslave/servos.ino	Wed Dec 07 21:10:22 2016 +0100
+++ b/i2cslave/servos.ino	Wed Dec 07 21:10:42 2016 +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);
 }