Revert "Mock attachInterrupt and detachInterrupt"

This reverts commit c22862c.

Author: ianfixes

CHANGELOG.md

@@ -13,7 +13,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Refactored documentation
 - External libraries aren't forcibly installed via the Arduino binary (in `arduino_cmd_remote.rb`) if they appear to exist on disk already
-- `attachInterrupt` and `detachInterrupt` are now mocked instead of `_NOP`
 
 ### Deprecated
 

REFERENCE.md

@@ -351,18 +351,3 @@ unittest(modem_hardware)
 Note that instead of setting `mLast = output` in the `onMatchInput()` function for test purposes, we could just as easily queue some bytes to state->serialPort[0].dataIn for the library under test to find on its next `peek()` or `read()`.  Or we could execute some action on a digital or analog input pin; the possibilities are fairly endless in this regard, although you will have to define them yourself -- from scratch -- extending the `DataStreamObserver` class to emulate your physical device.
 
 
-### Interrupts
-
-Although ISRs should be tested directly (as their asynchronous nature is not mocked), the act of attaching or detaching an interrupt can be measured.
-
-```C++
-unittest(interrupt_attachment) {
-  GodmodeState *state = GODMODE();
-  state->reset();
-  assertFalse(state->interrupt[7].attached);
-  attachInterrupt(7, (void (*)(void))0, 3);
-  assertTrue(state->interrupt[7].attached);
-  assertEqual(state->interrupt[7].mode, 3);
-  detachInterrupt(7);
-  assertFalse(state->interrupt[7].attached);
-}```

SampleProjects/TestSomething/test/godmode.cpp

@@ -172,17 +172,6 @@ unittest(pin_write_history)
 
 }
 
-unittest(interrupt_attachment) {
-  GodmodeState *state = GODMODE();
-  state->reset();
-  assertFalse(state->interrupt[0].attached);
-  attachInterrupt(0, (void (*)(void))0, 3);
-  assertTrue(state->interrupt[0].attached);
-  assertEqual(state->interrupt[0].mode, 3);
-  detachInterrupt(0);
-  assertFalse(state->interrupt[0].attached);
-}
-
 #ifdef HAVE_HWSERIAL0
 
   void smartLightswitchSerialHandler(int pin) {

cpp/arduino/Arduino.h

@@ -43,6 +43,9 @@ typedef uint8_t byte;
 #define yield() _NOP()
 #define interrupts() _NOP()
 #define noInterrupts() _NOP()
+#define attachInterrupt(...) _NOP()
+#define detachInterrupt(...) _NOP()
+
 
 // TODO: correctly establish this per-board!
 #define F_CPU 1000000UL

cpp/arduino/Godmode.cpp

@@ -67,16 +67,6 @@ int analogRead(unsigned char pin) {
   return godmode->analogPin[pin].retrieve();
 }
 
-void attachInterrupt(uint8_t interrupt, void ISR(void), uint8_t mode) {
-  GodmodeState* godmode = GODMODE();
-  godmode->interrupt[interrupt].attached = true;
-  godmode->interrupt[interrupt].mode = mode;
-}
-
-void detachInterrupt(uint8_t interrupt) {
-  GodmodeState* godmode = GODMODE();
-  godmode->interrupt[interrupt].attached = false;
-}
 
 // Serial ports
 #if defined(HAVE_HWSERIAL0)

cpp/arduino/Godmode.h

@@ -38,19 +38,13 @@ class GodmodeState {
     unsigned long readDelayMicros;
   };
 
-  struct InterruptDef {
-    bool attached;
-    uint8_t mode;
-  };
-
   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
     PinHistory<bool> digitalPin[MOCK_PINS_COUNT];
     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
 
     void resetPins() {
       for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
@@ -63,16 +57,9 @@ class GodmodeState {
       micros = 0;
     }
 
-    void resetInterrupts() {
-      for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
-        interrupt[i].attached = false;
-      }
-    }
-
     void reset() {
       resetClock();
       resetPins();
-      resetInterrupts();
       seed = 1;
     }
 
@@ -103,8 +90,6 @@ int analogRead(uint8_t);
 void analogWrite(uint8_t, int);
 #define analogReadResolution(...) _NOP()
 #define analogWriteResolution(...) _NOP()
-void attachInterrupt(uint8_t interrupt, void ISR(void), uint8_t mode);
-void detachInterrupt(uint8_t interrupt);
 
 // TODO: issue #26 to track the commanded state here
 inline void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0) {}