Beautify up and also test for SPI.

Author: aentinger

examples/ts_spi/ts_spi.ino

@@ -25,7 +25,7 @@ void bmp388_thread_func();
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-BusDevice bmp388 = BusDeviceBase::create(SPI, BMP388_CS_PIN, 1000000, MSBFIRST, SPI_MODE0);
+BusDevice bmp388(SPI, BMP388_CS_PIN, 1000000, MSBFIRST, SPI_MODE0);
 
 static char thread_name[NUM_THREADS][32];
 
@@ -69,7 +69,7 @@ byte bmp388_read_reg(byte const reg_addr)
   byte read_buf[3] = {0};
 
   IoRequest req(write_buf, sizeof(write_buf), read_buf, sizeof(read_buf));
-  IoResponse rsp = bmp388->transfer(req);
+  IoResponse rsp = bmp388.transfer(req);
 
   /* Do other stuff */
 

src/BusDevice.cpp

@@ -26,7 +26,7 @@
 #include "wire/WireBusDevice.h"
 
 /**************************************************************************************
- * PUBLIC MEMBER FUNCTIONS
+ * BusDeviceBase PUBLIC MEMBER FUNCTIONS
  **************************************************************************************/
 
 BusDevice BusDeviceBase::create(arduino::HardwareSPI & spi, int const cs_pin, SPISettings const & spi_settings, byte const fill_symbol)
@@ -66,3 +66,46 @@ BusDevice BusDeviceBase::create(arduino::HardwareI2C & wire, byte const slave_ad
 {
   return BusDevice(new WireBusDevice(WireBusDeviceConfig{wire, slave_addr, restart, stop}));
 }
+
+/**************************************************************************************
+ * BusDevice CTOR/DTOR
+ **************************************************************************************/
+
+BusDevice::BusDevice(BusDeviceBase * dev)
+: _dev{dev}
+{ }
+
+BusDevice::BusDevice(arduino::HardwareSPI & spi, int const cs_pin, SPISettings const & spi_settings, byte const fill_symbol)
+{
+  *this = BusDeviceBase::create(spi, cs_pin, spi_settings, fill_symbol);
+}
+
+BusDevice::BusDevice(arduino::HardwareSPI & spi, int const cs_pin, uint32_t const spi_clock, BitOrder const spi_bit_order, SPIMode const spi_bit_mode, byte const fill_symbol)
+{
+  *this = BusDeviceBase::create(spi, cs_pin, spi_clock, spi_bit_order, spi_bit_mode, fill_symbol);
+}
+
+BusDevice::BusDevice(arduino::HardwareSPI & spi, SpiBusDeviceConfig::SpiSelectFunc spi_select, SpiBusDeviceConfig::SpiDeselectFunc spi_deselect, SPISettings const & spi_settings, byte const fill_symbol)
+{
+  *this = BusDeviceBase::create(spi, spi_select, spi_deselect, spi_settings, fill_symbol);
+}
+
+BusDevice::BusDevice(arduino::HardwareI2C & wire, byte const slave_addr)
+{
+  *this = BusDeviceBase::create(wire, slave_addr);
+}
+
+BusDevice::BusDevice(arduino::HardwareI2C & wire, byte const slave_addr, bool const restart)
+{
+  *this = BusDeviceBase::create(wire, slave_addr, restart);
+}
+
+BusDevice::BusDevice(arduino::HardwareI2C & wire, byte const slave_addr, bool const restart, bool const stop)
+{
+  *this = BusDeviceBase::create(wire, slave_addr, restart, stop);
+}
+
+IoResponse BusDevice::transfer(IoRequest & req)
+{
+  return _dev->transfer(req);
+}

src/BusDevice.h

@@ -39,10 +39,6 @@ namespace arduino
 
 class BusDevice;
 
-/**************************************************************************************
- * TYPEDEF
- **************************************************************************************/
-
 /**************************************************************************************
  * CLASS DECLARATION
  **************************************************************************************/
@@ -69,28 +65,24 @@ class BusDeviceBase
 class BusDevice
 {
 public:
-  BusDevice(BusDeviceBase* dev) : instance(dev) {};
-  /*
-  BusDevice(arduino::HardwareSPI & spi, int const cs_pin, SPISettings const & spi_settings, byte const fill_symbol = 0xFF) {
-    this = BusDeviceBase::create(spi, cs_pin, spi_settings, fill_symbol);
-  }
+
+  BusDevice(BusDeviceBase * dev);
+
+  BusDevice(arduino::HardwareSPI & spi, int const cs_pin, SPISettings const & spi_settings, byte const fill_symbol = 0xFF);
   BusDevice(arduino::HardwareSPI & spi, int const cs_pin, uint32_t const spi_clock, BitOrder const spi_bit_order, SPIMode const spi_bit_mode, byte const fill_symbol = 0xFF);
   BusDevice(arduino::HardwareSPI & spi, SpiBusDeviceConfig::SpiSelectFunc spi_select, SpiBusDeviceConfig::SpiDeselectFunc spi_deselect, SPISettings const & spi_settings, byte const fill_symbol = 0xFF);
-  */
-  //BusDevice(BusDevice&&) = default;
-  BusDevice(arduino::HardwareI2C & wire, byte const slave_addr) {
-    *this = BusDeviceBase::create(wire, slave_addr);
-  }
-  /*
+
+  BusDevice(arduino::HardwareI2C & wire, byte const slave_addr);
   BusDevice(arduino::HardwareI2C & wire, byte const slave_addr, bool const restart);
   BusDevice(arduino::HardwareI2C & wire, byte const slave_addr, bool const restart, bool const stop);
-  */
-  IoResponse transfer(IoRequest & req) {
-    return instance->transfer(req);
-  };
+
+  IoResponse transfer(IoRequest & req);
+
 
 private:
-  mbed::SharedPtr<BusDeviceBase> instance;
+
+  mbed::SharedPtr<BusDeviceBase> _dev;
+
 };
 
 #endif /* BUS_DEVICE_H_ */