MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #1985 from Arengorn/Development

Browse Source 
Update of servo.h
This commit is contained in:
Scott Lahteine 2015-04-27 22:10:02 -07:00
commit 31516e2a3b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@ -60,7 +60,7 @@
#endif #endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#include "servo.h" #include "Servo.h"
#endif #endif
#if HAS_DIGIPOTSS #if HAS_DIGIPOTSS

2
Marlin/Servo.cpp
View File

@ -48,7 +48,7 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <Arduino.h> #include <Arduino.h>
#include "servo.h" #include "Servo.h"
#define usToTicks(_us) (( clockCyclesPerMicrosecond()* _us) / 8) // converts microseconds to tick (assumes prescale of 8) // 12 Aug 2009 #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 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds