testing away

Author: Guswib

.vscode/settings.json

@@ -16,5 +16,71 @@
         }
     },
     "cmake.sourceDirectory": "${env:USERPROFILE}/Documents/GitHub/Arduino/ArduinoCore-mockMCU/test",
-    "cmake.buildDirectory": "${workspaceFolder}/build"
+    "cmake.buildDirectory": "${workspaceFolder}/build",
+    "files.associations": {
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "semaphore": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
+    }
 }

cores/arduino/UART.h

@@ -174,7 +174,7 @@ class UartClass : public HardwareSerial
     inline size_t write(int n) { return write((uint8_t)n); };
     using Print::write; // pull in write(str) and write(buf, size) from Print
     explicit operator bool() { return true; }
-    bool operator! () { return true; };
+    bool operator! () { return false; };
 
 
     void bind(UartClass& ser) {bound = &ser; }

libraries/SPI/SPI.cpp

@@ -27,11 +27,12 @@
 #define SPI_IMODE_EXTINT 1
 #define SPI_IMODE_GLOBAL 2
 
-#define PIN_SPI_MISO MISO
-#define PIN_SPI_MOSI MOSI
+//#define PIN_SPI_MISO MISO
+//#define PIN_SPI_MOSI MOSI
 
 
-SPIClass::SPIClass(uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, uint8_t uc_pinSS, uint8_t uc_mux)
+
+SPIClassMOCK::SPIClassMOCK(uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, uint8_t uc_pinSS, uint8_t uc_mux)
 {
   initialized = false;
 
@@ -43,7 +44,7 @@ SPIClass::SPIClass(uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, ui
   _uc_pinSS = uc_pinSS;
 }
 
-void SPIClass::begin()
+void SPIClassMOCK::begin()
 {
   init();
 
@@ -56,7 +57,7 @@ void SPIClass::begin()
   config(DEFAULT_SPI_SETTINGS);
 }
 
-void SPIClass::init()
+void SPIClassMOCK::init()
 {
   if (initialized)
     return;
@@ -68,71 +69,73 @@ void SPIClass::init()
   Serial.println("SPI.ini is called");
 }
 
-void SPIClass::config(SPISettingsMOCK settings)
+void SPIClassMOCK::config(SPISettingsMOCK settings)
 {
   //SPI0.CTRLA = settings.ctrla;
   //SPI0.CTRLB = settings.ctrlb;
 }
 
-void SPIClass::end()
+void SPIClassMOCK::end()
 {
   //SPI0.CTRLA &= ~(SPI_ENABLE_bm);
   initialized = false;
 }
 
-void SPIClass::usingInterrupt(int interruptNumber)
+void SPIClassMOCK::usingInterrupt(int interruptNumber)
 {
  ;
 }
 
-void SPIClass::notUsingInterrupt(int interruptNumber)
+void SPIClassMOCK::notUsingInterrupt(int interruptNumber)
 {
  ;
 }
 
-void SPIClass::detachMaskedInterrupts() {
+void SPIClassMOCK::detachMaskedInterrupts() {
  ;
 
 }
 
-void SPIClass::reattachMaskedInterrupts() {
+void SPIClassMOCK::reattachMaskedInterrupts() {
  ;
 }
 
-void SPIClass::beginTransaction(SPISettingsMOCK settings)
+void SPIClassMOCK::beginTransaction(SPISettingsMOCK settings)
 {
   Serial.print("SPI.beginTransaction: ");
   ;
 }
 
-void SPIClass::endTransaction(void)
+void SPIClassMOCK::endTransaction(void)
 {
   Serial.println("  --endTransaction");
 }
 
-void SPIClass::setBitOrder(BitOrder order)
+void SPIClassMOCK::setBitOrder(BitOrder order)
 {
  ;
 }
 
-void SPIClass::setDataMode(uint8_t mode)
+void SPIClassMOCK::setDataMode(uint8_t mode)
 {
     ;
 }
 
-void SPIClass::setClockDivider(uint8_t div)
+void SPIClassMOCK::setClockDivider(uint8_t div)
 {
  ;                                       // write value 
 }
 
-byte SPIClass::transfer(uint8_t data)
+byte SPIClassMOCK::transfer(uint8_t data)
 {
   Serial.print(" ");
   Serial.print(data,HEX);
+  if(stream.size() < stream.max_size())
+    stream.push_back(static_cast<char>(data));
   return data;                             // read data back
 }
 
-uint16_t SPIClass::transfer16(uint16_t data) {
+uint16_t SPIClassMOCK::transfer16(uint16_t data) {
   union { uint16_t val; struct { uint8_t lsb; uint8_t msb; }; } t;
 
   t.val = data;
@@ -141,13 +144,36 @@ uint16_t SPIClass::transfer16(uint16_t data) {
   return data;
 }
 
-void SPIClass::transfer(void *buf, size_t count)
+void SPIClassMOCK::transfer(void *buf, size_t count)
 {
-  for(size_t i=0;i<count,i++ ){
-    transfer( buf[i]);
+  if (NULL == buf) {
+        return;
+    }
+  uint8_t *buffer8 = (uint8_t *) buf;
+  for(size_t i=0;i<count;i++ ){
+    transfer( buffer8[i]);
     }
 }
 
-if SPI_HOWMANY > 0
-  SPIClass SPI (PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PIN_SPI_SS,  MUX_SPI);
-#endif
+int SPIClassMOCK::sizeStream()
+{
+  return stream.size();
+}
+
+int SPIClassMOCK::readStream()
+{
+  if (stream.size() == 0)
+    return -1;
+
+  /* Extract first/oldest element. */
+  char const c = stream.at(0);
+  /* Erase first/oldest element. */
+  stream.pop_front();
+
+  return c;
+}
+
+#if SPI_HOWMANY > 0
+  SPIClass SPI (PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PIN_SPI_CS,  MUX_SPI);
+#endif
+

libraries/SPI/SPI.h

@@ -24,6 +24,8 @@
 #include <api/HardwareSPI.h>
 #include <api/Print.h>
 
+#include <deque>
+
 #ifndef USE_MALLOC_FOR_IRQ_MAP
 #define USE_MALLOC_FOR_IRQ_MAP  0
 #endif
@@ -43,8 +45,8 @@
 #define MISO 2
 #define SCK 1
 
-#define PIN_SPI_SCK 100
-#define PIN_SPI_SS SS
+//#define PIN_SPI_SCK 100
+//#define PIN_SPI_SS SS
 
 #define MUX_SPI 0
 
@@ -177,13 +179,18 @@ class SPIClassMOCK : public arduino::HardwareSPI {
   void setBitOrder(BitOrder order);
   void setDataMode(uint8_t uc_mode);
   void setClockDivider(uint8_t uc_div);
-
+  
+    int readStream();
+    int sizeStream();
+  std::deque<char> stream;
   private:
 
   void init();
   void config(SPISettingsMOCK settings);
   void config(SPISettings settings) {
     config(SPISettingsMOCK(settings));
+
+    
   }
 
   // These undocumented functions should not be used.  SPI.transfer()
@@ -211,7 +218,7 @@ class SPIClassMOCK : public arduino::HardwareSPI {
   };
 
 #define SPIClass SPIClassMOCK
-
+#define SPISettings SPISettingsMOCK
 #if SPI_HOWMANY > 0
   extern SPIClass SPI;
 #endif

test/CMakeLists.txt

@@ -44,9 +44,10 @@ if(EXISTS ${arduinoCore_API})
 endif()
 message("Arduino_API at:      " ${arduinoCore_API} "       exists?" ${arduinoCore_API_exists})
 
+cmake_path(APPEND local_LIBS "${PRJ_ROOT}" "libraries")
 
-
-
+include_directories(${local_LIBS}/Wire) #Path tho arduino-core
+include_directories(${local_LIBS}/SPI) #Path tho arduino-core
 include_directories(../variants/mock_v1) #Path tho arduino-core
 
 include_directories(external/catch/v2.13.9/include)
@@ -83,6 +84,7 @@ set(TEST_SRCS
 
   src/Serial/test_Serial.cpp
   src/SPI/test_SPI.cpp
+  
 
 )
 
@@ -95,11 +97,16 @@ set(TEST_DUT_SRCS
   ${arduinoCore_API}/Print.cpp
   ${arduinoCore_API}/Common.cpp
 
+ 
   ${arduinoCore}/UART.cpp
   ${arduinoCore}/UART0.cpp
   ${arduinoCore}/UART1.cpp
   ${arduinoCore}/UART2.cpp
   ${arduinoCore}/UART3.cpp
+
+  ${local_LIBS}/SPI/SPI.cpp
+  ${local_LIBS}/Wire/Wire.cpp
+
   ../variants/mock_v1/variant.cpp
 )
 #message(${TEST_DUT_SRCS})