Update Servo library to match with official Servo library

Signed-off-by: fpr <[email protected]>

Author: fpr

Diff for: libraries/Servo/library.properties

@@ -1,9 +1,9 @@
 name=Servo
-version=1.1.1
+version=1.1.2
 author=Michael Margolis, Arduino
 maintainer=Arduino <[email protected]>
-sentence=Allows Arduino boards to control a variety of servo motors. For all Arduino boards.
+sentence=Allows Arduino/Genuino boards to control a variety of servo motors.
 paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos using only 1 timer.<br />On the Arduino Due you can control up to 60 servos.<br />
 category=Device Control
 url=http://www.arduino.cc/en/Reference/Servo
-architectures=stm32
+architectures=avr,sam,samd,nrf52,stm32f4,stm32

Diff for: libraries/Servo/Servo.h renamed to libraries/Servo/src/Servo.h

@@ -59,20 +59,36 @@
  */
 
 // Architecture specific include
-#include "ServoTimers.h"
+#if defined(ARDUINO_ARCH_AVR)
+#include "avr/ServoTimers.h"
+#elif defined(ARDUINO_ARCH_SAM)
+#include "sam/ServoTimers.h"
+#elif defined(ARDUINO_ARCH_SAMD)
+#include "samd/ServoTimers.h"
+#elif defined(ARDUINO_ARCH_STM32F4)
+#include "stm32f4/ServoTimers.h"
+#elif defined(ARDUINO_ARCH_NRF52)
+#include "nrf52/ServoTimers.h"
+#elif defined(ARDUINO_ARCH_STM32)
+#include "stm32/ServoTimers.h"
+#else
+#error "This library only supports boards with an AVR, SAM, SAMD, NRF52, STM32F4 or STM32 processor."
+#endif
 
 #define Servo_VERSION           2     // software version of this library
 
-#define MIN_PULSE_WIDTH       480     // the shortest pulse sent to a servo
-#define MAX_PULSE_WIDTH      2200     // the longest pulse sent to a servo
-#define DEFAULT_PULSE_WIDTH  1300     // default pulse width when servo is attached
+#define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
+#define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#define DEFAULT_PULSE_WIDTH  1500     // default pulse width when servo is attached
 #define REFRESH_INTERVAL    20000     // minumim time to refresh servos in microseconds
 
-#define SERVOS_PER_TIMER       12      // the maximum number of servos controlled by one timer
+#define SERVOS_PER_TIMER       12     // the maximum number of servos controlled by one timer
 #define MAX_SERVOS   (_Nbr_16timers  * SERVOS_PER_TIMER)
 
 #define INVALID_SERVO         255     // flag indicating an invalid servo index
 
+#if !defined(ARDUINO_ARCH_STM32F4)
+
 typedef struct  {
   uint8_t nbr        :6 ;             // a pin number from 0 to 63
   uint8_t isActive   :1 ;             // true if this channel is enabled, pin not pulsed if false
@@ -96,10 +112,10 @@ class Servo
   int readMicroseconds();            // returns current pulse width in microseconds for this servo (was read_us() in first release)
   bool attached();                   // return true if this servo is attached, otherwise false
 private:
-  uint8_t servoIndex;               // index into the channel data for this servo
-  int8_t min;                       // minimum is this value times 4 added to MIN_PULSE_WIDTH
-  int8_t max;                       // maximum is this value times 4 added to MAX_PULSE_WIDTH
-  stimer_t _timer;
+   uint8_t servoIndex;               // index into the channel data for this servo
+   int8_t min;                       // minimum is this value times 4 added to MIN_PULSE_WIDTH
+   int8_t max;                       // maximum is this value times 4 added to MAX_PULSE_WIDTH
 };
 
 #endif
+#endif

Diff for: libraries/Servo/Servo.cpp renamed to libraries/Servo/src/stm32/Servo.cpp

@@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-//#if defined(ARDUINO_ARCH_SAMD)
+#if defined(ARDUINO_ARCH_STM32)
 
 #include <Arduino.h>
 #include <Servo.h>
@@ -199,3 +199,5 @@ bool Servo::attached()
 {
   return servos[this->servoIndex].Pin.isActive;
 }
+
+#endif // ARDUINO_ARCH_STM32

Diff for: libraries/Servo/ServoTimers.h renamed to libraries/Servo/src/stm32/ServoTimers.h

@@ -27,9 +27,10 @@
 #ifndef __SERVO_TIMERS_H__
 #define __SERVO_TIMERS_H__
 
-typedef enum { 
+// Uses one timer. Allows until 12 servos.
+typedef enum {
   _timer1,
-  _Nbr_16timers 
+  _Nbr_16timers
 } timer16_Sequence_t;
 
 #endif   // __SERVO_TIMERS_H__