factor out Godmode to its own file

Author: ianfixes

cpp/arduino/Arduino.cpp

@@ -1,56 +1,61 @@
 #include "Arduino.h"
-
-GodmodeState godmode = GodmodeState();
-
-GodmodeState* GODMODE() {
-  return &godmode;
-}
+#include "Godmode.h"
 
 unsigned long millis() {
-  return godmode.micros / 1000;
+  GodmodeState* godmode = GODMODE();
+  return godmode->micros / 1000;
 }
 
 unsigned long micros() {
-  return godmode.micros;
+  GodmodeState* godmode = GODMODE();
+  return godmode->micros;
 }
 
 void delay(unsigned long millis) {
-  godmode.micros += millis * 1000;
+  GodmodeState* godmode = GODMODE();
+  godmode->micros += millis * 1000;
 }
 
 void delayMicroseconds(unsigned long micros) {
-  godmode.micros += micros;
+  GodmodeState* godmode = GODMODE();
+  godmode->micros += micros;
 }
 
 
 void randomSeed(unsigned long seed)
 {
-  godmode.seed = seed;
+  GodmodeState* godmode = GODMODE();
+  godmode->seed = seed;
 }
 
 long random(long vmax)
 {
-  godmode.seed += 4294967291;  // it's a prime that fits in 32 bits
-  return godmode.seed % vmax;
+  GodmodeState* godmode = GODMODE();
+  godmode->seed += 4294967291;  // it's a prime that fits in 32 bits
+  return godmode->seed % vmax;
 }
 
 long random(long vmin, long vmax)
 {
   return vmin < vmax ? (random(vmax - vmin) + vmin) : vmin;
 }
 
-void digitalWrite(uint8_t pin, uint8_t val) {
-  godmode.digitalPin[pin] = val;
+void digitalWrite(unsigned char pin, unsigned char val) {
+  GodmodeState* godmode = GODMODE();
+  godmode->digitalPin[pin] = val;
 }
 
-int digitalRead(uint8_t pin) {
-  return godmode.digitalPin[pin];
+int digitalRead(unsigned char pin) {
+  GodmodeState* godmode = GODMODE();
+  return godmode->digitalPin[pin];
 }
 
-int analogRead(uint8_t pin) {
-  return godmode.analogPin[pin];
+int analogRead(unsigned char pin) {
+  GodmodeState* godmode = GODMODE();
+  return godmode->analogPin[pin];
 }
 
-void analogWrite(uint8_t pin, int val) {
-  godmode.analogPin[pin] = val;
+void analogWrite(unsigned char pin, int val) {
+  GodmodeState* godmode = GODMODE();
+  godmode->analogPin[pin] = val;
 }

cpp/arduino/Arduino.h

@@ -6,59 +6,21 @@ Where possible, variable names from the Arduino library are used to avoid confli
 
 */
 // Chars and strings
+
+#include "ArduinoDefines.h"
+#include "Godmode.h"
+
 #include "WCharacter.h"
 #include "WString.h"
 
 typedef bool boolean;
 typedef uint8_t byte;
 
-#include "ArduinoDefines.h"
 #include "binary.h"
 
 // Math and Trig
 #include "AvrMath.h"
 
-
-
-
-
-
-#define MOCK_PINS_COUNT 256
-
-class GodmodeState {
-  public:
-    unsigned long micros;
-    unsigned long seed;
-    // not going to put pinmode here unless its really needed. can't think of why it would be
-    uint8_t digitalPin[MOCK_PINS_COUNT];
-    int analogPin[MOCK_PINS_COUNT];
-
-    void resetPins() {
-      for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
-        digitalPin[i] = LOW;
-        analogPin[i] = 0;
-      }
-    }
-
-    void resetClock() {
-      micros = 0;
-    }
-
-    void reset() {
-      resetClock();
-      resetPins();
-      seed = 1;
-    }
-
-    GodmodeState() {
-      reset();
-    }
-
-};
-
-GodmodeState* GODMODE();
-
-
 // Bits and Bytes
 #define bit(b) (1UL << (b))
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))

cpp/arduino/Godmode.cpp

@@ -0,0 +1,7 @@
+#include "Godmode.h"
+
+GodmodeState godmode = GodmodeState();
+
+GodmodeState* GODMODE() {
+  return &godmode;
+}

cpp/arduino/Godmode.h

@@ -0,0 +1,38 @@
+#pragma once
+#include "ArduinoDefines.h"
+
+#define MOCK_PINS_COUNT 256
+
+class GodmodeState {
+  public:
+    unsigned long micros;
+    unsigned long seed;
+    // not going to put pinmode here unless its really needed. can't think of why it would be
+    bool digitalPin[MOCK_PINS_COUNT];
+    int analogPin[MOCK_PINS_COUNT];
+
+    void resetPins() {
+      for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
+        digitalPin[i] = LOW;
+        analogPin[i] = 0;
+      }
+    }
+
+    void resetClock() {
+      micros = 0;
+    }
+
+    void reset() {
+      resetClock();
+      resetPins();
+      seed = 1;
+    }
+
+    GodmodeState() {
+      reset();
+    }
+
+};
+
+GodmodeState* GODMODE();
+