Additional __ARDUINO_CI_SFR_MOCK commits (squashed)

Author: James Foster

SampleProjects/TestSomething/test/defines.cpp

@@ -19,6 +19,15 @@ unittest(SFR_IO8)
   // this tests that directly
   auto foo = &DDRE;  // avoid compiler warning by using the result of an expression
 }
+
+unittest(read_write)
+{
+  _SFR_IO8(1) = 0x11;
+  _SFR_IO8(2) = 0x22;
+  assertEqual((int) 0x11, (int) _SFR_IO8(1));
+  assertEqual((int) 0x22, (int) _SFR_IO8(2));
+  assertEqual((int) 0x2211, (int) _SFR_IO16(1));
+}
 #endif
 
 unittest_main()

SampleProjects/TestSomething/test/godmode.cpp

@@ -176,18 +176,35 @@ unittest(spi) {
   // 8-bit
   state->reset();
   state->spi.dataIn = "LMNO";
+  SPI.beginTransaction(SPISettings(14000000, LSBFIRST, SPI_MODE0));
   uint8_t out8 = SPI.transfer('a');
+  SPI.endTransaction();
   assertEqual("a", state->spi.dataOut);
   assertEqual('L', out8);
   assertEqual("MNO", state->spi.dataIn);
 
-  // 16-bit
+  // 16-bit MSBFIRST
   union { uint16_t val; struct { char lsb; char msb; }; } in16, out16;
   state->reset();
   state->spi.dataIn = "LMNO";
   in16.lsb = 'a';
   in16.msb = 'b';
+  SPI.beginTransaction(SPISettings(14000000, MSBFIRST, SPI_MODE0));
   out16.val = SPI.transfer16(in16.val);
+  SPI.endTransaction();
+  assertEqual("NO", state->spi.dataIn);
+  assertEqual('M', out16.lsb);
+  assertEqual('L', out16.msb);
+  assertEqual("ba", state->spi.dataOut);
+
+  // 16-bit LSBFIRST
+  state->reset();
+  state->spi.dataIn = "LMNO";
+  in16.lsb = 'a';
+  in16.msb = 'b';
+  SPI.beginTransaction(SPISettings(14000000, LSBFIRST, SPI_MODE0));
+  out16.val = SPI.transfer16(in16.val);
+  SPI.endTransaction();
   assertEqual("NO", state->spi.dataIn);
   assertEqual('L', out16.lsb);
   assertEqual('M', out16.msb);
@@ -197,14 +214,15 @@ unittest(spi) {
   state->reset();
   state->spi.dataIn = "LMNOP";
   char inBuf[6] = "abcde";
+  SPI.beginTransaction(SPISettings(14000000, LSBFIRST, SPI_MODE0));
   SPI.transfer(inBuf, 4);
+  SPI.endTransaction();
 
   assertEqual("abcd", state->spi.dataOut);
   assertEqual("LMNOe", String(inBuf));
 }
 
 
-
 #ifdef HAVE_HWSERIAL0
 
   void smartLightswitchSerialHandler(int pin) {

cpp/arduino/Godmode.cpp

@@ -119,4 +119,4 @@ TwoWire Wire = TwoWire();
   EEPROMClass EEPROM;
 #endif
 
-volatile long long __ARDUINO_CI_SFR_MOCK[1024];
+volatile uint8_t __ARDUINO_CI_SFR_MOCK[1024];

cpp/arduino/avr/io.h

@@ -96,10 +96,11 @@
 #ifndef _AVR_IO_H_
 #define _AVR_IO_H_
 
-// hardware mocks
+#include <stdint.h>
 
+// hardware mocks
 // this set of macros is all we need from the sfr file
-extern volatile long long __ARDUINO_CI_SFR_MOCK[1024];
+extern volatile uint8_t __ARDUINO_CI_SFR_MOCK[1024];
 #define _SFR_IO8(io_addr) (*(volatile uint8_t *)(__ARDUINO_CI_SFR_MOCK + io_addr))
 #define _SFR_IO16(io_addr) (*(volatile uint16_t *)(__ARDUINO_CI_SFR_MOCK + io_addr))
 #define _SFR_MEM8(io_addr) (*(volatile uint8_t *)(__ARDUINO_CI_SFR_MOCK + io_addr))