rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-13 10:29:35 +01:00
Code Issues Releases Activity

Fixed compile error on StandardFirmata example.

Browse Source 
Revert "Servo library refactoring. See #1617"

This reverts commit e8834d32f3f09cf6ce9a52bd30ba552bcb8291ef.

See #1617
This commit is contained in:
Cristian Maglie 2013-11-18 10:53:27 +01:00
parent d0758af29a
commit 32832069ce
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/Servo/arch/avr/Servo.cpp
View File

@ -20,8 +20,7 @@
#include <avr/interrupt.h>
#include <Arduino.h>
#include <Servo.h>
#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

1
libraries/Servo/arch/sam/Servo.cpp
View File

@ -19,7 +19,6 @@
#include <Arduino.h>
#include <Servo.h>
#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

3
libraries/Servo/src/Servo.h
View File

@ -58,6 +58,9 @@
* _Nbr_16timers indicates how many 16 bit timers are available.
*/
// Architecture specific include
#include <ServoTimers.h>
#define Servo_VERSION 2 // software version of this library
#define MIN_PULSE_WIDTH 544 // the shortest pulse sent to a servo