Wire implementation converted from map to deque, courtesy of James Foster

Author: lsaca05

SampleProjects/TestSomething/test/wire.cpp

@@ -1,78 +1,68 @@
 #include <ArduinoUnitTests.h>
 #include <Arduino.h>
-#include <vector>
-#include <map>
-
 #include <Wire.h>
 using namespace std;
 
-unittest(beginAsMaster) {
-    Wire.begin();
-    assertTrue(Wire.getIsMaster());
-}
-
-unittest(beginAsSlave) {
-    Wire.begin(13);
-    assertFalse(Wire.getIsMaster());
-}
-
-unittest(getMasterAddress) {
-    Wire.begin();
-    assertEqual(0, Wire.getAddress());
-}
-
-unittest(getSlaveAddress) {
-    Wire.begin(13);
-    assertEqual(13, Wire.getAddress());
-}
-
 unittest(begin_write_end) {
+    deque<uint8_t>* mosi = Wire.getMosi(14);
+    assertEqual(0, mosi->size());
     Wire.begin();
     Wire.beginTransmission(14);
-    assertEqual(14, Wire.getAddress());
-    
-    assertTrue(Wire.isTxBufferEmpty());
-
     Wire.write(0x07);
     Wire.write(0x0E);
-    assertEqual(0x07, Wire.getTxBufferElement(0));
-    assertEqual(0x0E, Wire.getTxBufferElement(1));
-
     Wire.endTransmission();
-    assertTrue(Wire.isTxBufferEmpty());
-
-    vector<int> finalData = {0x07, 0x0E};
-    assert(finalData == Wire.getDataWritten(14));
+    assertEqual(2, mosi->size());
+    assertEqual(0x07, mosi->front());
+    mosi->pop_front();
+    assertEqual(0x0E, mosi->front());
+    mosi->pop_front();
+    assertEqual(0, mosi->size());
 }
 
 unittest(readTwo_writeOne) {
     Wire.begin();
-    
-    vector<int> data1 = {0x07, 0x0E}, data2 = {1, 4, 7};
-    Wire.setDataToRead(19, data1);
-    Wire.setDataToRead(34, data2);
+    deque<uint8_t>* miso;
+    miso = Wire.getMiso(19);
+    miso->push_back(0x07);
+    miso->push_back(0x0E);
+    miso = Wire.getMiso(34);
+    miso->push_back(1);
+    miso->push_back(4);
+    miso->push_back(7);
 
-    assertEqual(2, Wire.requestFrom(19, 1));
-    assertEqual(3, Wire.requestFrom(34, 1));
-    assertEqual(data1.size() + data2.size(), Wire.getRxBufferSize());
+    assertEqual(0, Wire.requestFrom(19, 3));
+    assertEqual(2, Wire.requestFrom(19, 2));
+    assertEqual(2, Wire.available());
+    assertEqual(0x07, Wire.read());
+    assertEqual(1, Wire.available());
+    assertEqual(0x0E, Wire.read());
+    assertEqual(0, Wire.available());
+    assertEqual(3, Wire.requestFrom(34, 3));
+    assertEqual(3, Wire.available());
+    assertEqual(1, Wire.read());
+    assertEqual(2, Wire.available());
+    assertEqual(4, Wire.read());
+    assertEqual(1, Wire.available());
+    assertEqual(7, Wire.read());
+    assertEqual(0, Wire.available());
 
     Wire.beginTransmission(47);
-    assertEqual(47, Wire.getAddress());
-    assertTrue(Wire.isTxBufferEmpty());
-    for (int i = 0; i < 5; i++) {
-        Wire.write(Wire.read());
+    for (int i = 1; i < 4; i++) {
+        Wire.write(i * 2);
     }
-    assertEqual(0x07, Wire.getTxBufferElement(0));
-    assertEqual(0x0E, Wire.getTxBufferElement(1));
-    assertEqual(1, Wire.getTxBufferElement(2));
-    assertEqual(4, Wire.getTxBufferElement(3));
-    assertEqual(7, Wire.getTxBufferElement(4));
-
     Wire.endTransmission();
-    assertTrue(Wire.isTxBufferEmpty());
+    deque<uint8_t>* mosi = Wire.getMosi(47);
 
-    vector<int> finalData = {0x07, 0x0E, 1, 4, 7};
-    assert(finalData == Wire.getDataWritten(47));
+    assertEqual(3, mosi->size());
+    assertEqual(2, mosi->front());
+    mosi->pop_front();
+    assertEqual(2, mosi->size());
+    assertEqual(4, mosi->front());
+    mosi->pop_front();
+    assertEqual(1, mosi->size());
+    assertEqual(6, mosi->front());
+    mosi->pop_front();
+    assertEqual(0, mosi->size());
 }
 
 unittest_main()