aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2010-05-21 16:14:00 -0700
committerbnewbold <bnewbold@robocracy.org>2010-05-21 16:14:00 -0700
commitf30bc0ea864e8f3ae04f198b4a3d58b34cc5efd3 (patch)
tree7d15e6b873f221b4fcf4812165b04f42bf832b83 /wirish
parent73444bbbe2aebb9d2d4ed62e52f6fde69532bbeb (diff)
downloadlibrambutan-f30bc0ea864e8f3ae04f198b4a3d58b34cc5efd3.tar.gz
librambutan-f30bc0ea864e8f3ae04f198b4a3d58b34cc5efd3.zip
get wirish_math stuff going (random, map, etc)
Perry, you might want to look this over... I only include the contents of wirish_math.h when cpp? It's what arduino does and it works, so...
Diffstat (limited to 'wirish')
-rw-r--r--wirish/WProgram.h1
-rw-r--r--wirish/wirish.h1
-rw-r--r--wirish/wirish_math.h3
3 files changed, 4 insertions, 1 deletions
diff --git a/wirish/WProgram.h b/wirish/WProgram.h
index 6f0b913..5445518 100644
--- a/wirish/WProgram.h
+++ b/wirish/WProgram.h
@@ -25,7 +25,6 @@
#include "wirish.h"
#include "HardwareSerial.h"
#include "HardwareUsb.h"
-#include "math.h"
#include "usb.h"
void setup();
diff --git a/wirish/wirish.h b/wirish/wirish.h
index 5129c26..f54517a 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -38,6 +38,7 @@
#include "time.h"
#include "pwm.h"
#include "ext_interrupts.h"
+#include "wirish_math.h"
#ifdef __cplusplus
extern "C"{
diff --git a/wirish/wirish_math.h b/wirish/wirish_math.h
index 19f3892..8746d01 100644
--- a/wirish/wirish_math.h
+++ b/wirish/wirish_math.h
@@ -27,6 +27,8 @@
#include <math.h>
+#ifdef __cplusplus
+
void randomSeed(unsigned int);
long random(long);
long random(long, long);
@@ -54,3 +56,4 @@ long map(long, long, long, long, long);
#endif
+#endif