Skip to content

Commit

Permalink
Merge pull request #1985 from Arengorn/Development
Browse files Browse the repository at this point in the history
Update of servo.h
  • Loading branch information
thinkyhead committed Apr 28, 2015
2 parents 185f8a0 + e449659 commit 31516e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#endif

#if NUM_SERVOS > 0
#include "servo.h"
#include "Servo.h"
#endif

#if HAS_DIGIPOTSS
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Servo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <avr/interrupt.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 ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
Expand Down

0 comments on commit 31516e2

Please sign in to comment.