aboutsummaryrefslogtreecommitdiffstats
path: root/wirish/io.h
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-10-18 15:11:25 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-18 15:12:21 -0400
commit8f97a6061ad5e7a9fe42b98f5ec1e2fa8aa7051c (patch)
tree3106b624c61c660b31302a4a19aa14ea04d7d10a /wirish/io.h
parent66b204637594927f72e47d87d9c279682d1bd174 (diff)
downloadlibrambutan-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/io.h')
-rw-r--r--wirish/io.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/wirish/io.h b/wirish/io.h
index 50e748f..0cb9c04 100644
--- a/wirish/io.h
+++ b/wirish/io.h
@@ -33,10 +33,9 @@
#ifndef _IO_H_
#define _IO_H_
-#include "gpio.h"
-#include "adc.h"
+#include "libmaple_types.h"
-#include "wirish_time.h"
+#include "boards.h"
/**
* Specifies a GPIO pin behavior.
@@ -112,6 +111,9 @@ typedef enum WiringPinMode {
*/
void pinMode(uint8 pin, WiringPinMode mode);
+#define HIGH 0x1
+#define LOW 0x0
+
/**
* Writes a (digital) value to a pin. The pin must have its
* mode set to OUTPUT or OUTPUT_OPEN_DRAIN.
@@ -219,4 +221,3 @@ uint8 waitForButtonPress(uint32 timeout_millis=0);
void shiftOut(uint8 dataPin, uint8 clockPin, uint8 bitOrder, uint8 value);
#endif
-