Merge pull request #9 from caveman99/master

Enable compilation with nrf52 arduino toolchain
lewisxhe · Mar 15, 2024 · 27fd0f7 · 27fd0f7
2 parents e2d3207 + bc23059
commit 27fd0f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/SensorLib.h b/src/SensorLib.h
@@ -65,6 +65,8 @@
 #define DEFAULT_SCL     (0xFF)
 #define DEFAULT_SPISETTING  SPISettings()
 #elif defined(NRF52840_XXAA) || defined(NRF52832_XXAA)
+#define PLATFORM_SPI_TYPE               SPIClass
+#define PLATFORM_WIRE_TYPE              TwoWire
 #define SPI_DATA_ORDER  MSBFIRST
 #define DEFAULT_SDA     (0xFF)
 #define DEFAULT_SCL     (0xFF)

diff --git a/src/bosch/common/bosch_interfaces.cpp b/src/bosch/common/bosch_interfaces.cpp
@@ -32,7 +32,7 @@
 #if defined(ARDUINO_ARCH_RP2040)
 SPISettings  SensorInterfaces::__spiSetting = SPISettings();
 #else
-SPISettings  SensorInterfaces::__spiSetting = SPISettings(4000000, SPI_MSBFIRST, SPI_MODE0);
+SPISettings  SensorInterfaces::__spiSetting = SPISettings(4000000, SPI_DATA_ORDER, SPI_MODE0);
 #endif
 
 void SensorInterfaces::close_interfaces(SensorLibConfigure config)
@@ -52,6 +52,10 @@ bool SensorInterfaces::setup_interfaces(SensorLibConfigure config)
         config.u.i2c_dev.wire->setSDA(config.u.i2c_dev.sda);
         config.u.i2c_dev.wire->setSCL(config.u.i2c_dev.scl);
         config.u.i2c_dev.wire->begin();
+#elif defined(NRF52840_XXAA) || defined(NRF52832_XXAA)
+        config.u.i2c_dev.wire->end();
+        config.u.i2c_dev.wire->setPins(config.u.i2c_dev.sda,config.u.i2c_dev.scl);
+        config.u.i2c_dev.wire->begin();
 #else
         config.u.i2c_dev.wire->begin(config.u.i2c_dev.sda, config.u.i2c_dev.scl);
 #endif
@@ -68,6 +72,9 @@ bool SensorInterfaces::setup_interfaces(SensorLibConfigure config)
         config.u.spi_dev.spi->setRX(config.u.spi_dev.miso);
         config.u.spi_dev.spi->setTX(config.u.spi_dev.mosi);
         config.u.spi_dev.spi->begin();
+#elif defined(NRF52840_XXAA) || defined(NRF52832_XXAA)
+        config.u.spi_dev.spi->setPins(config.u.spi_dev.miso,config.u.spi_dev.sck, config.u.spi_dev.mosi);
+        config.u.spi_dev.spi->begin();
 #else
         config.u.spi_dev.spi->begin(config.u.spi_dev.sck, config.u.spi_dev.miso, config.u.spi_dev.mosi);
 #endif