aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/Servo
diff options
context:
space:
mode:
authorPerry Hung <iperry@gmail.com>2011-01-24 23:23:29 -0500
committerPerry Hung <iperry@gmail.com>2011-01-24 23:23:29 -0500
commitc48689d34809943a5907884bd287cea9ae275352 (patch)
treed49ff06b0d4b81f6ab0eac8060d178ce7542476c /libraries/Servo
parent64431fd4b59cb8656365f1fad5f679cd4d756239 (diff)
parenta9b2d70bc7799ca96c1673b18fe3012b1a4dd329 (diff)
downloadlibrambutan-c48689d34809943a5907884bd287cea9ae275352.tar.gz
librambutan-c48689d34809943a5907884bd287cea9ae275352.zip
Merge remote branch 'leaf/master'
Diffstat (limited to 'libraries/Servo')
-rw-r--r--libraries/Servo/Servo.cpp4
-rw-r--r--libraries/Servo/Servo.h2
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: