From 32832069ce5f7477719d762c0a6bad8fc65a854a Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 18 Nov 2013 10:53:27 +0100 Subject: [PATCH] Fixed compile error on StandardFirmata example. Revert "Servo library refactoring. See #1617" This reverts commit e8834d32f3f09cf6ce9a52bd30ba552bcb8291ef. See #1617 --- libraries/Servo/arch/avr/Servo.cpp | 3 +-- libraries/Servo/arch/sam/Servo.cpp | 1 - libraries/Servo/src/Servo.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/Servo/arch/avr/Servo.cpp b/libraries/Servo/arch/avr/Servo.cpp index 9474cf98a..e4801b97e 100644 --- a/libraries/Servo/arch/avr/Servo.cpp +++ b/libraries/Servo/arch/avr/Servo.cpp @@ -20,8 +20,7 @@ #include #include -#include -#include "ServoTimers.h" +#include "Servo.h" #define usToTicks(_us) (( clockCyclesPerMicrosecond()* _us) / 8) // converts microseconds to tick (assumes prescale of 8) // 12 Aug 2009 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds diff --git a/libraries/Servo/arch/sam/Servo.cpp b/libraries/Servo/arch/sam/Servo.cpp index 78c404079..dec911019 100644 --- a/libraries/Servo/arch/sam/Servo.cpp +++ b/libraries/Servo/arch/sam/Servo.cpp @@ -19,7 +19,6 @@ #include #include -#include "ServoTimers.h" #define usToTicks(_us) (( clockCyclesPerMicrosecond() * _us) / 32) // converts microseconds to tick #define ticksToUs(_ticks) (( (unsigned)_ticks * 32)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h index 48948f73d..10e79a87e 100644 --- a/libraries/Servo/src/Servo.h +++ b/libraries/Servo/src/Servo.h @@ -58,6 +58,9 @@ * _Nbr_16timers indicates how many 16 bit timers are available. */ +// Architecture specific include +#include + #define Servo_VERSION 2 // software version of this library #define MIN_PULSE_WIDTH 544 // the shortest pulse sent to a servo