compiles!

Author: gigapod

src/sfeTk/sfeTkIBus.h

@@ -56,7 +56,7 @@ class sfeTkIBus
     ///
     /// @retval int returns the number of bytes written, < 0 on error
     ///
-    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, uint16_t length) = 0;
+    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length) = 0;
 
     /// @brief Read a single byte from the given register
     ///
@@ -84,7 +84,7 @@ class sfeTkIBus
     ///
     /// @retval int returns 0 on success, or error code
     ///
-    virtual int readRegisterRegion(uint8_t reg, uint8_t *data, uint16_t numBytes) = 0;
+    virtual int readRegisterRegion(uint8_t reg, uint8_t *data, size_t numBytes) = 0;
 };
 
 //};

src/sfeTk/sfeTkII2C.h

@@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "sfeTkIBus.h"
 
-class sfeTkI2C : public sfeTkIBus
+class sfeTkII2C : public sfeTkIBus
 {
   public:
-    sfeTkI2C() : _address{kNoAddress}
+    sfeTkII2C() : _address{kNoAddress}
     {
     }
-    sfeTkI2C(uint8_t addr) : _address{addr}
+    sfeTkII2C(uint8_t addr) : _address{addr}
     {
     }
 

src/sfeTk/sfeTkISPI.h

@@ -27,14 +27,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "sfeTkIBus.h"
 
-class sfeTkSPI : public sfeTkIBus
+class sfeTkISPI : public sfeTkIBus
 {
   public:
-    sfeTkSPI() : _cs{kNoCSPin}
+    sfeTkISPI() : _cs{kNoCSPin}
     {
     }
 
-    sfeTkSPI(uint8_t csPin) : _cs{csPin}
+    sfeTkISPI(uint8_t csPin) : _cs{csPin}
     {
     }
     /// @brief setter for the CS Pin

src/sfeTkArdI2C.cpp

@@ -115,7 +115,7 @@ bool sfeTkArdI2C::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite)
     if (!_i2cPort)
         return false;
 
-    return writeRegisterRegion(devReg, &dataToWrite, sizeof(u_int16_t)) == 0;
+    return writeRegisterRegion(devReg, (uint8_t *)&dataToWrite, sizeof(u_int16_t)) == 0;
 }
 
 //---------------------------------------------------------------------------------
@@ -125,7 +125,7 @@ bool sfeTkArdI2C::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite)
 //
 // Returns the number of bytes written, < 0 is an error
 //
-virtual int sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, uint16_t length)
+int sfeTkArdI2C::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
 {
     if (!_i2cPort)
         return -1;
@@ -155,7 +155,7 @@ bool sfeTkArdI2C::readRegisterByte(uint8_t devReg, uint8_t &dataToRead)
     int nData = 0;
 
     _i2cPort->beginTransmission(address());
-    _i2cPort->write(offset);
+    _i2cPort->write(devReg);
     _i2cPort->endTransmission();
     _i2cPort->requestFrom(address(), (uint8_t)1);
 
@@ -182,7 +182,7 @@ bool sfeTkArdI2C::readRegisterWord(uint8_t devReg, uint16_t &dataToRead)
     if (!_i2cPort)
         return false;
 
-    return readRegisterRegion(devReg, &dataToRead, sizeof(u_int16_t)) == 2;
+    return readRegisterRegion(devReg, (uint8_t *)&dataToRead, sizeof(uint16_t)) == 2;
 }
 
 //---------------------------------------------------------------------------------
@@ -192,7 +192,7 @@ bool sfeTkArdI2C::readRegisterWord(uint8_t devReg, uint16_t &dataToRead)
 //
 // Returns the number of bytes read, < 0 is an error
 //
-virtual int sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, uint16_t numBytes)
+int sfeTkArdI2C::readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes)
 {
     // got port
     if (!_i2cPort)

src/sfeTkArdI2C.h

@@ -48,7 +48,7 @@ class sfeTkArdI2C : public sfeTkII2C
     }
 
     // copy constructor
-    sfeTkArdI2C(sfeTkArdI2C const &rhs) : _i2cPort{rhs._i2cPort}
+    sfeTkArdI2C(sfeTkArdI2C const &rhs) : sfeTkII2C(), _i2cPort{rhs._i2cPort}
     {
     }
 
@@ -76,7 +76,7 @@ class sfeTkArdI2C : public sfeTkII2C
     ///
     /// @retval True on successful execution.
     ///
-    bool init(TwoWire &wirePort, uint8_t addr, bInit = false);
+    bool init(TwoWire &wirePort, uint8_t addr, bool bInit = false);
 
     /// @brief A simple ping of the device at the given address.
     /// @note sfeTkIBus interface method
@@ -105,7 +105,7 @@ class sfeTkArdI2C : public sfeTkII2C
     ///
     /// @retval returns number of bytes written, < 0 is an error code
     ///
-    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, uint16_t length);
+    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
 
     /// @brief Reads a byte of data from the given register.
     /// @note sfeTkIBus interface method
@@ -136,7 +136,7 @@ class sfeTkArdI2C : public sfeTkII2C
     ///
     /// @retval 0 on success, < 0 on error - see error code
     ///
-    virtual int readRegisterRegion(uint8_t devReg, uint8_t *data, uint16_t numBytes);
+    virtual int readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes);
 
   private:
     // The actual Arduino i2c port

src/sfeTkArdSPI.cpp

@@ -1,5 +1,5 @@
 
-// sfeTkBusSPI.cpp - Arduino SPI implementation for the toolkit
+// sfeTkArdSPI.cpp - Arduino SPI implementation for the toolkit
 
 /*
 The MIT License (MIT)
@@ -22,9 +22,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#pragma once
-
-#include "sfeTkArdSPI.h "
+#include "sfeTkArdSPI.h"
+#include <Arduino.h>
 
 // Note: A leading "1" must be added to transfer with register to indicate a "read"
 // Note to our future selves:
@@ -38,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 // Arduino version of init. Will take in a defined SPI port/settings
 //
-bool sfeTkBusSPI::init(SPIClass &spiPort, SPISettings &busSPISettings, uint8_t csPin, bool bInit)
+bool sfeTkArdSPI::init(SPIClass &spiPort, SPISettings &busSPISettings, uint8_t csPin, bool bInit)
 {
     // if we don't have a SPI port already
     if (!_spiPort)
@@ -62,10 +61,10 @@ bool sfeTkBusSPI::init(SPIClass &spiPort, SPISettings &busSPISettings, uint8_t c
 //
 // Arduino version of init.
 //
-bool sfeTkBusSPI::init(uint8_t csPin, bool bInit)
+bool sfeTkArdSPI::init(uint8_t csPin, bool bInit)
 {
     // If the transaction settings are not provided by the user they are built here.
-    SPISettings spiSettings = SPISettings(3000000, MSBFIRST, SPI_MODE3);
+    SPISettings spiSettings = SPISettings(3000000, SPI_MSBFIRST, SPI_MODE3);
 
     // In addition of the port is not provided by the user, it defaults to SPI here.
     return init(SPI, spiSettings, csPin, bInit);
@@ -76,7 +75,7 @@ bool sfeTkBusSPI::init(uint8_t csPin, bool bInit)
 //
 // Arduino version of init.
 //
-bool sfeTkBusSPI::init(bool bInit)
+bool sfeTkArdSPI::init(bool bInit)
 {
     return init(cs(), bInit);
 }
@@ -88,7 +87,7 @@ bool sfeTkBusSPI::init(bool bInit)
 //
 // Returns true on success, false on failure
 //
-bool sfeTkBusSPI::writeRegisterByte(uint8_t devReg, uint8_t dataToWrite)
+bool sfeTkArdSPI::writeRegisterByte(uint8_t devReg, uint8_t dataToWrite)
 {
 
     if (!_spiPort)
@@ -115,11 +114,9 @@ bool sfeTkBusSPI::writeRegisterByte(uint8_t devReg, uint8_t dataToWrite)
 //
 // Returns true on success, false on failure
 //
-bool sfeTkBusSPI::writeRegisterWord(uint8_t devReg, uint8_t dataToWrite)
+bool sfeTkArdSPI::writeRegisterWord(uint8_t devReg, uint16_t dataToWrite)
 {
-
-    return writeRegisterRegion(defReg, &dataToWrite, sizeof(uint8_t)) > 0;
-    ;
+    return writeRegisterRegion(devReg, (uint8_t *)&dataToWrite, sizeof(uint8_t)) > 0;
 }
 //---------------------------------------------------------------------------------
 // writeRegisterRegion()
@@ -128,7 +125,7 @@ bool sfeTkBusSPI::writeRegisterWord(uint8_t devReg, uint8_t dataToWrite)
 //
 // Returns the number of bytes written, < 0 is an error
 //
-virtual int sfeTkBusSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, uint16_t length)
+int sfeTkArdSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length)
 {
     if (!_spiPort)
         return -1;
@@ -150,14 +147,14 @@ virtual int sfeTkBusSPI::writeRegisterRegion(uint8_t devReg, const uint8_t *data
     return length;
 }
 
-bool sfeTkBusSPI::readRegisterByte(uint8_t devReg, uint8_t &data)
+bool sfeTkArdSPI::readRegisterByte(uint8_t devReg, uint8_t &data)
 {
-    return readRegisterRegion(devReg, &data) == 1;
+    return readRegisterRegion(devReg, &data, sizeof(data)) == 1;
 }
 
-bool sfeTkBusSPI::readRegisterWord(uint8_t devReg, uint16_t &data)
+bool sfeTkArdSPI::readRegisterWord(uint8_t devReg, uint16_t &data)
 {
-    return readRegisterRegion(devReg, &data) == 2;
+    return readRegisterRegion(devReg, (uint8_t *)&data, sizeof(data)) == 2;
 }
 //---------------------------------------------------------------------------------
 // readRegisterRegion()
@@ -166,7 +163,7 @@ bool sfeTkBusSPI::readRegisterWord(uint8_t devReg, uint16_t &data)
 //
 // Returns the number of bytes read, < 0 is an error
 //
-virtual int sfeTkBusSPI::readRegisterRegion(uint8_t devReg, uint8_t *data, uint16_t numBytes)
+int sfeTkArdSPI::readRegisterRegion(uint8_t devReg, uint8_t *data, size_t numBytes)
 {
     if (!_spiPort)
         return -1;
@@ -187,5 +184,5 @@ virtual int sfeTkBusSPI::readRegisterRegion(uint8_t devReg, uint8_t *data, uint1
     digitalWrite(cs(), HIGH);
     _spiPort->endTransaction();
 
-    return numByte;
+    return numBytes;
 }

src/sfeTkArdSPI.h

@@ -27,20 +27,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include <SPI.h>
-#include <sfeTk/sfeTkIBus.h>
+#include <sfeTk/sfeTkISPI.h>
 
 /// @brief This class implements the IBus interface for an SPI Implementation on Arduino
 ///
-class sfeTkBusSPI : public sfeTkIBus
+class sfeTkArdSPI : public sfeTkISPI
 {
   public:
     ///
     /// @brief Constructor
     ///
-    sfeTkBusSPI(void) : _spiPort(nullptr){};
+    sfeTkArdSPI(void) : _spiPort(nullptr){};
 
     // copy constructor
-    sfeTkArdSPI(sfeTkArdSPI const &rhs) : _spiPort{rhs._spiPort}, _sfeSPISettings{rhs._sfeSPISettings}
+    sfeTkArdSPI(sfeTkArdSPI const &rhs) : sfeTkISPI(), _spiPort{rhs._spiPort}, _sfeSPISettings{rhs._sfeSPISettings}
     {
     }
 
@@ -60,7 +60,7 @@ class sfeTkBusSPI : public sfeTkIBus
     ///
     bool init(bool bInit = false);
 
-    bool init(uint8_t csPin, bInit = false);
+    bool init(uint8_t csPin, bool bInit = false);
 
     /// @brief Method sets up the required SPI settings.
     ///
@@ -98,7 +98,7 @@ class sfeTkBusSPI : public sfeTkIBus
     ///
     /// @retval int - number of bytes written, < 0 = error value
     ///
-    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, uint16_t length);
+    virtual int writeRegisterRegion(uint8_t devReg, const uint8_t *data, size_t length);
 
     /// @brief Read a single byte from the given register
     ///
@@ -126,7 +126,7 @@ class sfeTkBusSPI : public sfeTkIBus
     ///
     /// @retval int returns the number of bytes read, < 0 on error
     ///
-    virtual int readRegisterRegion(uint8_t reg, uint8_t *data, uint16_t numBytes);
+    virtual int readRegisterRegion(uint8_t reg, uint8_t *data, size_t numBytes);
 
   private:
     SPIClass *_spiPort;