Fix some cross-stuff

Author: facchinm

Diff for: api/Common.h

@@ -7,25 +7,25 @@ extern "C"{
 void yield(void);
 
 typedef enum {
-  LOW   = 0x0,
-  HIGH  = 0x1,
+  LOW     = 0,
+  HIGH    = 1,
+  CHANGE  = 2,
+  FALLING = 3,
+  RISING  = 4,
 } PinStatus;
 
-typedef enum {
-  IRQ_LOW     = 0,
-  IRQ_HIGH    = 1,
-  CHANGE      = 2,
-  FALLING     = 3,
-  RISING      = 4,
-} InterruptMode;
-
 typedef enum {
   INPUT           = 0x0,
   OUTPUT          = 0x1,
   INPUT_PULLUP    = 0x2,
   INPUT_PULLDOWN  = 0x3,
 } PinMode;
 
+typedef enum {
+  LSBFIRST = 0,
+  MSBFIRST = 1,
+} BitMode;
+
 #define PI          3.1415926535897932384626433832795
 #define HALF_PI     1.5707963267948966192313216916398
 #define TWO_PI      6.283185307179586476925286766559
@@ -36,11 +36,6 @@ typedef enum {
 #define SERIAL      0x0
 #define DISPLAY     0x1
 
-typedef enum {
-  LSBFIRST = 0,
-  MSBFIRST = 1,
-} BitMode;
-
 #ifndef min
 #define min(a,b) \
    ({ __typeof__ (a) _a = (a); \
@@ -119,10 +114,10 @@ void delayMicroseconds(unsigned int us);
 unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout);
 unsigned long pulseInLong(pin_size_t pin, uint8_t state, unsigned long timeout);
 
-void shiftOut(pin_size_t dataPin, pin_size_t clockPin, uint8_t bitOrder, uint8_t val);
-pin_size_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, uint8_t bitOrder);
+void shiftOut(pin_size_t dataPin, pin_size_t clockPin, BitMode bitOrder, uint8_t val);
+pin_size_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitMode bitOrder);
 
-void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, InterruptMode mode);
+void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus mode);
 void detachInterrupt(pin_size_t interruptNumber);
 
 void setup(void);

Diff for: api/Stream.cpp

@@ -22,7 +22,7 @@
  findMulti/findUntil routines written by Jim Leonard/Xuth
  */
 
-#include "Arduino.h"
+#include "Common.h"
 #include "Stream.h"
 
 #define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait