argh, forgot to sync the last changes from 1.3.3

SpenceKonde · Dec 15, 2019 · b14fb15 · b14fb15
1 parent 85ca9f9
commit b14fb15
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h
@@ -64,8 +64,12 @@
 
 
 #define Servo_VERSION           2     // software version of this library
+#ifndef MIN_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
-#define MAX_PULSE_WIDTH      2400
+#endif
+#ifndef MAX_PULSE_WIDTH               // Let the user set min/max pulse lengths
+#define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#endif
 #define MAX_SERVOS              5
 #define INVALID_SERVO         255
 
@@ -101,8 +105,12 @@ class Servo
 
 #define Servo_VERSION           2     // software version of this library
 
+#ifndef MIN_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
+#endif
+#ifndef MAX_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#endif
 #define DEFAULT_PULSE_WIDTH  1500     // default pulse width when servo is attached
 #define REFRESH_INTERVAL    20000     // minumim time to refresh servos in microseconds
 

diff --git a/libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h b/libraries/Servo_ATTinyCore/src/Servo_ATTinyCore.h
@@ -64,8 +64,12 @@
 
 
 #define Servo_VERSION           2     // software version of this library
+#ifndef MIN_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
-#define MAX_PULSE_WIDTH      2400
+#endif
+#ifndef MAX_PULSE_WIDTH               // Let the user set min/max pulse lengths
+#define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#endif
 #define MAX_SERVOS              5
 #define INVALID_SERVO         255
 
@@ -101,8 +105,12 @@ class Servo
 
 #define Servo_VERSION           2     // software version of this library
 
+#ifndef MIN_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
+#endif
+#ifndef MAX_PULSE_WIDTH               // Let the user set min/max pulse lengths
 #define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#endif
 #define DEFAULT_PULSE_WIDTH  1500     // default pulse width when servo is attached
 #define REFRESH_INTERVAL    20000     // minumim time to refresh servos in microseconds
 

diff --git a/platform.txt b/platform.txt
@@ -5,7 +5,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=ATTinyCore
-version=1.3.3-dev
+version=1.3.3
 
 # AVR compile variables
 # ---------------------