diff options
author | bnewbold <bnewbold@robocracy.org> | 2010-09-01 00:02:36 -0400 |
---|---|---|
committer | bnewbold <bnewbold@robocracy.org> | 2010-09-01 00:02:36 -0400 |
commit | d6a32991684b7bfd8b91e3358dee4ca3fc887021 (patch) | |
tree | 535ebe6501bda800363c5f4debccf532d289bc1e /wirish/wirish.h | |
parent | 9c9d6c153154981fdedbe3f9ed4a1fb61e2b7776 (diff) | |
parent | 0ccec95446d4c7f3ea47a46d267c791fb22bb8d4 (diff) | |
download | librambutan-d6a32991684b7bfd8b91e3358dee4ca3fc887021.tar.gz librambutan-d6a32991684b7bfd8b91e3358dee4ca3fc887021.zip |
Various fixes, working with Maple
Diffstat (limited to 'wirish/wirish.h')
-rw-r--r-- | wirish/wirish.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/wirish/wirish.h b/wirish/wirish.h index 9ca5692..d293901 100644 --- a/wirish/wirish.h +++ b/wirish/wirish.h @@ -32,10 +32,11 @@ #define _WIRISH_H_ #include "libmaple.h" +#include "boards.h" +#include "time.h" #include "timers.h" #include "io.h" #include "bits.h" -#include "time.h" #include "pwm.h" #include "ext_interrupts.h" #include "wirish_math.h" @@ -52,9 +53,6 @@ extern "C"{ #endif -#define MAPLE 1 -#define NR_MAPLE_PINS 39 // temporary - /* Arduino wiring macros and bit defines */ #define HIGH 0x1 #define LOW 0x0 @@ -65,9 +63,6 @@ extern "C"{ #define LSBFIRST 0 #define MSBFIRST 1 -#define USER_ADDR_ROM 0x08005000 -#define USER_ADDR_RAM 0x20000C00 - #define lowByte(w) ((w) & 0xff) #define highByte(w) ((w) >> 8) #define bitRead(value, bit) (((value) >> (bit)) & 0x01) @@ -87,8 +82,5 @@ void shiftOut(uint8 dataPin, uint8 clockPin, uint8 bitOrder, byte val); } // extern "C" #endif - - - #endif |