setting address for I2C now working

Author: gigapod

src/sfeTk/sfeDevSoilMoisture.cpp

@@ -88,7 +88,7 @@ float sfeDevSoilMoisture::readMoisturePercentage(void)
 }
 //----------------------------------------------------------------------------------------
 // Change the I2C address of the sensor
-sfeTkError_t sfeDevSoilMoisture::changeSensorAddress(uint8_t newAddress)
+sfeTkError_t sfeDevSoilMoisture::setI2CAddress(uint8_t newAddress)
 {
     if (_theBus == nullptr)
         return kSTkErrFail;
@@ -97,6 +97,28 @@ sfeTkError_t sfeDevSoilMoisture::changeSensorAddress(uint8_t newAddress)
     if (newAddress < 0x07 || newAddress > 0x78)
         return kSTkErrFail;
 
-    // Send the command to change the address
-    return _theBus->writeRegisterByte(kCommandChangeAddress, newAddress);
+    // If in I2C mode, is the address the same as the current address?
+    if (_theBus->type() == kBusTypeI2C && ((sfeTkII2C *)_theBus)->address() == newAddress)
+        return kSTkErrOk;
+
+    // Send the command to change the address. NOTE: Because of how the sensor works, 
+    // the following will return an error (since the sensor side resets the bus)
+    (void) _theBus->writeRegisterByte(kCommandChangeAddress, newAddress);
+
+    return kSTkErrOk;
+}
+//----------------------------------------------------------------------------------------
+// Return the address of the sensor bus. For I2C this is the address of the sensor, for
+// SPI this is the CS pin
+uint8_t sfeDevSoilMoisture::address(void)
+{
+    if (_theBus == nullptr)
+        return 0;
+
+    if (_theBus->type() == kBusTypeSPI)
+        return ((sfeTkISPI *)_theBus)->cs();
+    else if (_theBus->type() == kBusTypeI2C)
+        return ((sfeTkII2C *)_theBus)->address();
+    
+    return 0;
 }

src/sfeTk/sfeDevSoilMoisture.h

@@ -16,6 +16,10 @@
 // include the sparkfun toolkit headers
 #include <sfeTk/sfeToolKit.h>
 
+// Bus interfaces
+#include <sfeTk/sfeTkII2C.h>
+#include <sfeTk/sfeTkISPI.h>
+
 // Default I2C address for the sensor
 #define SFE_SOIL_MOISTURE_DEFAULT_I2C_ADDRESS 0x28
 
@@ -59,7 +63,12 @@ class sfeDevSoilMoisture
     /// @brief Changes the I2C address of the sensor
     /// @param newAddress The new I2C address to assign to the sensor
     /// @return kSTkErrOk if successful, otherwise an error code
-    sfeTkError_t changeSensorAddress(uint8_t newAddress);
+    /// @note If communicating via I2C, the provided address is used for future communication
+    sfeTkError_t setI2CAddress(uint8_t newAddress);
+
+    /// @brief Returns the current address of the sensor. I2C - bus address, SPI - CS Pin
+    //  @return The current I2C address of the sensor, or the CS pin for SPI
+    uint8_t address(void);
 
   protected:
     // The toolkit bus the sensor is connected to