Implement new hardware abstraction from InfiniTime using C++20 concepts.

CMakeLists.txt

@@ -20,7 +20,7 @@ project(InfiniSim VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
 # https://cmake.org/cmake/help/latest/prop_tgt/CXX_STANDARD.html
 string(COMPARE EQUAL "${CMAKE_CXX_STANDARD}" "" no_cmake_cxx_standard_set)
 if(no_cmake_cxx_standard_set)
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 20)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
   set(CMAKE_CXX_EXTENSIONS OFF)
   message(STATUS "Using default C++ standard ${CMAKE_CXX_STANDARD}")
@@ -142,12 +142,13 @@ target_sources(infinisim PUBLIC
   sim/drivers/Cst816s.cpp
   sim/drivers/Hrs3300.h
   sim/drivers/Hrs3300.cpp
-  sim/drivers/SpiMaster.h
-  sim/drivers/SpiMaster.cpp
+  sim/drivers/infinisim/SpiMaster.h
+  sim/drivers/infinisim/Spi.h
+  sim/drivers/infinisim/Spi.cpp
   sim/drivers/TwiMaster.h
   sim/drivers/TwiMaster.cpp
-  sim/drivers/SpiNorFlash.h
-  sim/drivers/SpiNorFlash.cpp
+  sim/drivers/infinisim/SpiNorFlash.h
+  sim/drivers/infinisim/SpiNorFlash.cpp
   sim/heartratetask/HeartRateTask.h
   sim/heartratetask/HeartRateTask.cpp
 )
@@ -214,7 +215,6 @@ target_sources(infinisim PUBLIC
   ${InfiniTime_DIR}/src/components/timer/TimerController.cpp
   ${InfiniTime_DIR}/src/drivers/PinMap.h
   ${InfiniTime_DIR}/src/drivers/Spi.h
-  ${InfiniTime_DIR}/src/drivers/Spi.cpp
   ${InfiniTime_DIR}/src/drivers/St7789.h
   ${InfiniTime_DIR}/src/drivers/St7789.cpp
   ${InfiniTime_DIR}/src/touchhandler/TouchHandler.h
@@ -335,13 +335,13 @@ add_executable(littlefs-do
   ${InfiniTime_DIR}/src/components/fs/FS.h
   ${InfiniTime_DIR}/src/components/fs/FS.cpp
   # dependencies for FS.h
-  sim/drivers/SpiNorFlash.h
-  sim/drivers/SpiNorFlash.cpp
+  sim/drivers/infinisim/SpiNorFlash.h
+  sim/drivers/infinisim/SpiNorFlash.cpp
   # dependencies for SpiNorFlash.h
   ${InfiniTime_DIR}/src/drivers/Spi.h
-  ${InfiniTime_DIR}/src/drivers/Spi.cpp
-  sim/drivers/SpiMaster.h
-  sim/drivers/SpiMaster.cpp
+  sim/drivers/infinisim/SpiMaster.h
+  sim/drivers/infinisim/Spi.h
+  sim/drivers/infinisim/Spi.cpp
 
   ${InfiniTime_DIR}/src/components/settings/Settings.h
   ${InfiniTime_DIR}/src/components/settings/Settings.cpp

littlefs-do-main.cpp

@@ -22,7 +22,7 @@
 
 #include "components/fs/FS.h"
 #include "components/settings/Settings.h"
-#include "drivers/SpiNorFlash.h"
+#include "drivers/infinisim/SpiNorFlash.h"
 
 #include "nlohmann/json.hpp"
 #include "miniz.h"

main.cpp

@@ -30,25 +30,24 @@
 #include <drivers/Bma421.h>
 
 #include "BootloaderVersion.h"
+#include "buttonhandler/ButtonHandler.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
 #include "components/brightness/BrightnessController.h"
-#include "components/motor/MotorController.h"
 #include "components/datetime/DateTimeController.h"
-#include "components/heartrate/HeartRateController.h"
 #include "components/fs/FS.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/motor/MotorController.h"
+#include "drivers/Cst816s.h"
+#include "drivers/PinMap.h"
 #include "drivers/Spi.h"
-#include "drivers/SpiMaster.h"
-#include "drivers/SpiNorFlash.h"
 #include "drivers/St7789.h"
 #include "drivers/TwiMaster.h"
-#include "drivers/Cst816s.h"
-#include "drivers/PinMap.h"
+#include "sim/drivers/infinisim/SpiMaster.h"
+#include "sim/drivers/infinisim/SpiNorFlash.h"
 #include "systemtask/SystemTask.h"
-#include "drivers/PinMap.h"
 #include "touchhandler/TouchHandler.h"
-#include "buttonhandler/ButtonHandler.h"
 
 // get the simulator-headers
 #include "displayapp/DisplayApp.h"
@@ -70,6 +69,8 @@
 #endif
 #include <gif.h>
 
+#include "port/infinitime.h"
+
 /*********************
  *      DEFINES
  *********************/
@@ -290,19 +291,19 @@ static constexpr uint8_t touchPanelTwiAddress = 0x15;
 static constexpr uint8_t motionSensorTwiAddress = 0x18;
 static constexpr uint8_t heartRateSensorTwiAddress = 0x44;
 
-Pinetime::Drivers::SpiMaster spi {Pinetime::Drivers::SpiMaster::SpiModule::SPI0,
-                                  {Pinetime::Drivers::SpiMaster::BitOrder::Msb_Lsb,
-                                   Pinetime::Drivers::SpiMaster::Modes::Mode3,
-                                   Pinetime::Drivers::SpiMaster::Frequencies::Freq8Mhz,
-                                   Pinetime::PinMap::SpiSck,
-                                   Pinetime::PinMap::SpiMosi,
-                                   Pinetime::PinMap::SpiMiso}};
+Pinetime::Drivers::Infinisim::SpiMaster spiImpl {};
+Pinetime::Drivers::SpiMaster spi {spiImpl};
+
 
-Pinetime::Drivers::Spi lcdSpi {spi, Pinetime::PinMap::SpiLcdCsn};
+Pinetime::Drivers::Infinisim::Spi lcdSpiImpl {spiImpl, Pinetime::PinMap::SpiLcdCsn};
+Pinetime::Drivers::Spi lcdSpi {lcdSpiImpl};
 Pinetime::Drivers::St7789 lcd {lcdSpi, Pinetime::PinMap::LcdDataCommand};
 
-Pinetime::Drivers::Spi flashSpi {spi, Pinetime::PinMap::SpiFlashCsn};
-Pinetime::Drivers::SpiNorFlash spiNorFlash {"spiNorFlash.raw"};
+Pinetime::Drivers::Infinisim::Spi flashSpiImpl {spiImpl, Pinetime::PinMap::SpiFlashCsn};
+Pinetime::Drivers::Spi flashSpi {flashSpiImpl};
+
+Pinetime::Drivers::Infinisim::SpiNorFlash spiNorFlashImpl {"spiNorFlash.raw"};
+Pinetime::Drivers::SpiNorFlash spiNorFlash {spiNorFlashImpl};
 
 // The TWI device should work @ up to 400Khz but there is a HW bug which prevent it from
 // respecting correct timings. According to erratas heet, this magic value makes it run

sim/components/ble/NimbleController.h

@@ -25,10 +25,6 @@
 //#include "components/ble/FSService.h"
 
 namespace Pinetime {
-  namespace Drivers {
-    class SpiNorFlash;
-  }
-
   namespace System {
     class SystemTask;
   }