diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-10-18 15:11:25 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-10-18 15:12:21 -0400 |
commit | 8f97a6061ad5e7a9fe42b98f5ec1e2fa8aa7051c (patch) | |
tree | 3106b624c61c660b31302a4a19aa14ea04d7d10a /wirish/wirish.h | |
parent | 66b204637594927f72e47d87d9c279682d1bd174 (diff) | |
download | librambutan-8f97a6061ad5e7a9fe42b98f5ec1e2fa8aa7051c.tar.gz librambutan-8f97a6061ad5e7a9fe42b98f5ec1e2fa8aa7051c.zip |
wirish: Clean up includes; other fixups.
Clean up various core files' includes to fit this pattern:
- Header files include what they use.
- CPP files include their header first
- Include order is libmaple proper headers, then wirish
headers (modulo CPP rule above).
wirish.h: Move HIGH and LOW to io.h, and the boolean and byte typedefs
into wirish_types.h. These don't belong in wirish.h.
Add include guards to wirish_debug.h. Oops.
wirish_digital.cpp: Use standard bool instead of "boolean".
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish/wirish.h')
-rw-r--r-- | wirish/wirish.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/wirish/wirish.h b/wirish/wirish.h index 6be8423..d024f3b 100644 --- a/wirish/wirish.h +++ b/wirish/wirish.h @@ -27,18 +27,16 @@ /** * @brief Main include file for the Wirish core. * - * Includes various Arduino wiring macros and bit defines + * Includes most of Wirish, and (transitively or otherwise) + * substantial pieces of libmaple proper. */ #ifndef _WIRISH_H_ #define _WIRISH_H_ -#include "libmaple.h" - -#include "wirish_types.h" #include "boards.h" #include "io.h" -#include "bits.h" +#include "bit_constants.h" #include "pwm.h" #include "ext_interrupts.h" #include "wirish_debug.h" @@ -49,9 +47,10 @@ #include "HardwareTimer.h" #include "usb_serial.h" +#include "libmaple.h" +#include "wirish_types.h" + /* Arduino wiring macros and bit defines */ -#define HIGH 0x1 -#define LOW 0x0 #define true 0x1 #define false 0x0 @@ -68,8 +67,5 @@ bitClear(value, bit)) #define bit(b) (1UL << (b)) -typedef uint8 boolean; -typedef uint8 byte; - #endif |