diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-21 10:27:37 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-21 10:27:37 -0500 |
| commit | c45bccad44187da27505cf5808424e709e3f54a1 (patch) | |
| tree | 18a459a50f8d0551ba046e30462c93999d982725 /libraries | |
| parent | 84fd2532a7f23d20354ff590790b3f892cb7e7d7 (diff) | |
| parent | d5ad2a27f4e69e6cc9324331945937c983c30366 (diff) | |
| download | librambutan-c45bccad44187da27505cf5808424e709e3f54a1.tar.gz librambutan-c45bccad44187da27505cf5808424e709e3f54a1.zip | |
Merge branch 'master' into debug-serialusb.
Chose debug-serialusb version in cases of conflict.
Conflicts:
libmaple/usb/usb_callbacks.c
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Servo/Servo.cpp | 4 | ||||
| -rw-r--r-- | libraries/Servo/Servo.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp index 4f60fbe..ae87b63 100644 --- a/libraries/Servo/Servo.cpp +++ b/libraries/Servo/Servo.cpp @@ -22,13 +22,13 @@ * THE SOFTWARE. *****************************************************************************/ +#include "Servo.h" + #include "boards.h" #include "io.h" #include "pwm.h" #include "wirish_math.h" -#include "Servo.h" - // Configure prescaler and overflow for a 20msec period (could just // use HardwareTimer::setPeriod(), but this lets conversions below // happen more statically, in combination with an inlined map() -- a diff --git a/libraries/Servo/Servo.h b/libraries/Servo/Servo.h index d35572a..1c75618 100644 --- a/libraries/Servo/Servo.h +++ b/libraries/Servo/Servo.h @@ -27,7 +27,7 @@ #include <stdint.h> -#include "HardwareTimer.h" +#include "wirish.h" /* hack for IDE compile */ /* Note on Arduino compatibility: |