Browse Source

Merge pull request #1985 from Arengorn/Development

Update of servo.h
pull/1/head
Scott Lahteine 10 years ago
parent
commit
31516e2a3b
  1. 2
      Marlin/Marlin_main.cpp
  2. 2
      Marlin/Servo.cpp

2
Marlin/Marlin_main.cpp

@ -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

@ -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

Loading…
Cancel
Save