Browse Source

Merge pull request #1985 from Arengorn/Development

Update of servo.h
Scott Lahteine 9 years ago
parent
commit
31516e2a3b
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/Servo.cpp

+ 1
- 1
Marlin/Marlin_main.cpp View File

60
 #endif
60
 #endif
61
 
61
 
62
 #if NUM_SERVOS > 0
62
 #if NUM_SERVOS > 0
63
-  #include "servo.h"
63
+  #include "Servo.h"
64
 #endif
64
 #endif
65
 
65
 
66
 #if HAS_DIGIPOTSS
66
 #if HAS_DIGIPOTSS

+ 1
- 1
Marlin/Servo.cpp View File

48
 #include <avr/interrupt.h>
48
 #include <avr/interrupt.h>
49
 #include <Arduino.h>
49
 #include <Arduino.h>
50
 
50
 
51
-#include "servo.h"
51
+#include "Servo.h"
52
 
52
 
53
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
53
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
54
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
54
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds

Loading…
Cancel
Save