Split Common.h into separate Wiring headers

Author: kezorm

api/ArduinoAPI.h

@@ -23,6 +23,21 @@
 // version 1.0.0
 #define ARDUINO_API_VERSION 10000
 
+#include "WTypes.h"
+
+#include "WAnalog.h"
+#include "WCharacter.h"
+#include "WDelay.h"
+#include "WDigital.h"
+#include "WInterrupts.h"
+#include "WMath.h"
+#include "WMemory.h"
+#include "WPulse.h"
+#include "WRandom.h"
+#include "WShift.h"
+#include "WTime.h"
+#include "WTone.h"
+
 #include "Binary.h"
 
 #ifdef __cplusplus
@@ -39,17 +54,6 @@
 #include "Stream.h"
 #include "Udp.h"
 #include "USBAPI.h"
-#include "WCharacter.h"
 #endif
 
-/* Standard C library includes */
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <math.h>
-
-// Misc Arduino core functions
-#include "Common.h"
-
 #endif

api/Common.cpp

@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "Common.h"
 
 template <typename T>
 using voidTemplateFuncPtrParam =  void (*)(T param);

api/Common.h

@@ -22,9 +22,10 @@
  findMulti/findUntil routines written by Jim Leonard/Xuth
  */
 
-#include "Common.h"
 #include "Stream.h"
 
+#include "WTime.h"
+
 #define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait
 
 // private method to read stream with timeout

api/Interrupts.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+int analogRead(pin_size_t pinNumber);
+void analogReference(uint8_t mode);
+void analogWrite(pin_size_t pinNumber, int value);
+
+void analogReadResolution(int bits);
+void analogWriteResolution(int bits);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

api/Stream.cpp

@@ -0,0 +1,12 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+void delay(unsigned long ms);
+void delayMicroseconds(unsigned int us);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

api/WAnalog.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "WTypes.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+void pinMode(pin_size_t pinNumber, PinMode pinMode);
+void digitalWrite(pin_size_t pinNumber, PinStatus status);
+PinStatus digitalRead(pin_size_t pinNumber);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

api/WDelay.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "WTypes.h"
+
+#include <stdint.h>
+
+// interrupts() / noInterrupts() must be defined by the core
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+typedef void (*voidFuncPtr)(void);
+typedef void (*voidFuncPtrParam)(void*);
+
+void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus mode);
+void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, PinStatus mode, void* param);
+void detachInterrupt(pin_size_t interruptNumber);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

api/WDigital.h

@@ -0,0 +1,79 @@
+#pragma once
+
+#include <math.h>
+#include "WTypes.h"
+
+#define PI          3.1415926535897932384626433832795
+#define HALF_PI     1.5707963267948966192313216916398
+#define TWO_PI      6.283185307179586476925286766559
+
+#define EPSILON                        (0.0001)
+
+#define DEG_TO_RAD  0.017453292519943295769236907684886
+#define RAD_TO_DEG  57.295779513082320876798154814105
+
+#define EULER       2.718281828459045235360287471352
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+#define abs(x) ((x)>0?(x):-(x))
+
+#ifndef constrain
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#endif
+
+long map(long x, long in_min, long in_max, long out_min, long out_max);
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
+#ifndef min
+#define min(a,b) \
+   ({ __typeof__ (a) _a = (a); \
+       __typeof__ (b) _b = (b); \
+     _a < _b ? _a : _b; })
+#endif
+
+#ifndef max
+#define max(a,b) \
+   ({ __typeof__ (a) _a = (a); \
+       __typeof__ (b) _b = (b); \
+     _a > _b ? _a : _b; })
+#endif
+
+#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+
+#ifndef radians
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#endif
+
+#ifndef degrees
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#endif
+
+#ifndef sq
+#define sq(x) ((x)*(x))
+#endif
+
+#define lowByte(x)  ((uint8_t)((x) & 0xff))
+#define highByte(x) ((uint8_t)((x) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+#ifndef bit
+#define bit(b) (1UL << (b))
+#endif
+
+#ifdef __cplusplus
+
+word makeWord(uint16_t w);
+word makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+#endif

api/WInterrupts.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef __cplusplus
+#include <stdlib.h>
+
+void *operator new(size_t size);
+void operator delete(void *ptr);
+void *operator new[](size_t size);
+void operator delete[](void *ptr);
+
+#endif