Revert "Add SPI mocks"

ianfixes · web-flow · commit 78fc45dfafb6 · 2018-09-11T10:19:25.000-04:00
This reverts commit 937f10a.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Explicit checks that the requested test platforms are defined in YML
 - Arduino command wrapper can now guess whether a library is installed
 - CPP library class now reaches into included Arduino libraries for source files
-- SPI mocks
 
 ### Changed
 - Refactored documentation
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -366,43 +366,3 @@ unittest(interrupt_attachment) {
   detachInterrupt(7);
   assertFalse(state->interrupt[7].attached);
 }```
-
-
-### SPI
-
-These basic mocks of SPI store the values in Strings.
-
-```C++
-unittest(spi) {
-  GodmodeState *state = GODMODE();
-
-  // 8-bit
-  state->reset();
-  state->spi.dataIn = "LMNO";
-  uint8_t out8 = SPI.transfer('a');
-  assertEqual("a", state->spi.dataOut);
-  assertEqual('L', out8);
-  assertEqual("MNO", state->spi.dataIn);
-
-  // 16-bit
-  union { uint16_t val; struct { char lsb; char msb; }; } in16, out16;
-  state->reset();
-  state->spi.dataIn = "LMNO";
-  in16.lsb = 'a';
-  in16.msb = 'b';
-  out16.val = SPI.transfer16(in16.val);
-  assertEqual("NO", state->spi.dataIn);
-  assertEqual('L', out16.lsb);
-  assertEqual('M', out16.msb);
-  assertEqual("ab", state->spi.dataOut);
-
-  // buffer
-  state->reset();
-  state->spi.dataIn = "LMNOP";
-  char inBuf[6] = "abcde";
-  SPI.transfer(inBuf, 4);
-
-  assertEqual("abcd", state->spi.dataOut);
-  assertEqual("LMNOe", String(inBuf));
-}
-```
diff --git a/SampleProjects/TestSomething/test/godmode.cpp b/SampleProjects/TestSomething/test/godmode.cpp
@@ -183,44 +183,6 @@ unittest(interrupt_attachment) {
   assertFalse(state->interrupt[0].attached);
 }
 
-unittest(spi) {
-  GodmodeState *state = GODMODE();
-  state->reset();
-  assertEqual("", state->spi.dataIn);
-  assertEqual("", state->spi.dataOut);
-
-  // 8-bit
-  state->reset();
-  state->spi.dataIn = "LMNO";
-  uint8_t out8 = SPI.transfer('a');
-  assertEqual("a", state->spi.dataOut);
-  assertEqual('L', out8);
-  assertEqual("MNO", state->spi.dataIn);
-
-  // 16-bit
-  union { uint16_t val; struct { char lsb; char msb; }; } in16, out16;
-  state->reset();
-  state->spi.dataIn = "LMNO";
-  in16.lsb = 'a';
-  in16.msb = 'b';
-  out16.val = SPI.transfer16(in16.val);
-  assertEqual("NO", state->spi.dataIn);
-  assertEqual('L', out16.lsb);
-  assertEqual('M', out16.msb);
-  assertEqual("ab", state->spi.dataOut);
-
-  // buffer
-  state->reset();
-  state->spi.dataIn = "LMNOP";
-  char inBuf[6] = "abcde";
-  SPI.transfer(inBuf, 4);
-
-  assertEqual("abcd", state->spi.dataOut);
-  assertEqual("LMNOe", String(inBuf));
-}
-
-
-
 #ifdef HAVE_HWSERIAL0
 
   void smartLightswitchSerialHandler(int pin) {
diff --git a/cpp/arduino/Arduino.h b/cpp/arduino/Arduino.h
@@ -14,7 +14,6 @@ Where possible, variable names from the Arduino library are used to avoid confli
 #include "Print.h"
 #include "Stream.h"
 #include "HardwareSerial.h"
-#include "SPI.h"
 
 typedef bool boolean;
 typedef uint8_t byte;
diff --git a/cpp/arduino/Godmode.cpp b/cpp/arduino/Godmode.cpp
@@ -1,6 +1,5 @@
 #include "Godmode.h"
 #include "HardwareSerial.h"
-#include "SPI.h"
 
 GodmodeState godmode = GodmodeState();
 
@@ -98,6 +97,3 @@ inline std::ostream& operator << ( std::ostream& out, const PinHistory<T>& ph )
   out << ph;
   return out;
 }
-
-// defined in SPI.h
-SPIClass SPI = SPIClass(&godmode.spi.dataIn, &godmode.spi.dataOut);
diff --git a/cpp/arduino/Godmode.h b/cpp/arduino/Godmode.h
@@ -51,7 +51,6 @@ class GodmodeState {
     PinHistory<int> analogPin[MOCK_PINS_COUNT];
     struct PortDef serialPort[NUM_SERIAL_PORTS];
     struct InterruptDef interrupt[MOCK_PINS_COUNT]; // not sure how to get actual number
-    struct PortDef spi;
 
     void resetPins() {
       for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
@@ -70,27 +69,10 @@ class GodmodeState {
       }
     }
 
-    void resetPorts() {
-      for (int i = 0; i < serialPorts(); ++i)
-      {
-        serialPort[i].dataIn = "";
-        serialPort[i].dataOut = "";
-        serialPort[i].readDelayMicros = 0;
-      }
-    }
-
-    void resetSPI() {
-      spi.dataIn = "";
-      spi.dataOut = "";
-      spi.readDelayMicros = 0;
-    }
-
     void reset() {
       resetClock();
       resetPins();
       resetInterrupts();
-      resetPorts();
-      resetSPI();
       seed = 1;
     }
 
@@ -101,7 +83,14 @@ class GodmodeState {
     GodmodeState()
     {
       reset();
-    }
+      for (int i = 0; i < serialPorts(); ++i)
+      {
+        serialPort[i].dataIn = "";
+        serialPort[i].dataOut = "";
+        serialPort[i].readDelayMicros = 0;
+      }
+  }
+
 };
 
 // io pins
diff --git a/cpp/arduino/SPI.h b/cpp/arduino/SPI.h
