Supported custom I2C instance

Author: Francesco Stefanni

SHTSensor.cpp

@@ -27,7 +27,6 @@
  */
 
 #include <inttypes.h>
-#include <Wire.h>
 #include <Arduino.h>
 
 #include "SHTSensor.h"
@@ -53,34 +52,35 @@ bool SHTSensorDriver::readSample()
 
 const uint8_t SHTI2cSensor::EXPECTED_DATA_SIZE   = 6;
 
-bool SHTI2cSensor::readFromI2c(uint8_t i2cAddress,
+bool SHTI2cSensor::readFromI2c(TwoWire & wire,
+                               uint8_t i2cAddress,
                                const uint8_t *i2cCommand,
                                uint8_t commandLength, uint8_t *data,
                                uint8_t dataLength,
                                uint8_t duration)
 {
-  Wire.beginTransmission(i2cAddress);
+  wire.beginTransmission(i2cAddress);
   for (int i = 0; i < commandLength; ++i) {
-    if (Wire.write(i2cCommand[i]) != 1) {
+    if (wire.write(i2cCommand[i]) != 1) {
       return false;
     }
   }
 
-  if (Wire.endTransmission() != 0) {
+  if (wire.endTransmission() != 0) {
     return false;
   }
 
   delay(duration);
 
-  Wire.requestFrom(i2cAddress, dataLength);
+  wire.requestFrom(i2cAddress, dataLength);
 
   // check if the same number of bytes are received that are requested.
-  if (Wire.available() != dataLength) {
+  if (wire.available() != dataLength) {
     return false;
   }
 
   for (int i = 0; i < dataLength; ++i) {
-    data[i] = Wire.read();
+    data[i] = wire.read();
   }
   return true;
 }
@@ -115,7 +115,7 @@ bool SHTI2cSensor::readSample()
   //is omitted for SHT4x Sensors
   cmd[1] = mI2cCommand & 0xff;
 
-  if (!readFromI2c(mI2cAddress, cmd, mCmd_Size, data,
+  if (!readFromI2c(mWire, mI2cAddress, cmd, mCmd_Size, data,
                    EXPECTED_DATA_SIZE, mDuration)) {
     return false;
   }
@@ -135,8 +135,8 @@ bool SHTI2cSensor::readSample()
   val = (data[3] << 8) + data[4];
   mHumidity = mX + mY * (val / mZ);
 
-  return true; 
-  
+  return true;
+
 }
 
 //
@@ -146,9 +146,9 @@ bool SHTI2cSensor::readSample()
 class SHTC1Sensor : public SHTI2cSensor
 {
 public:
-    SHTC1Sensor()
+    SHTC1Sensor(TwoWire & wire)
         // clock stretching disabled, high precision, T first
-        : SHTI2cSensor(0x70, 0x7866, 15, -45, 175, 65535, 0, 100, 65535, 2)
+        : SHTI2cSensor(0x70, 0x7866, 15, -45, 175, 65535, 0, 100, 65535, 2, wire)
     {
     }
 };
@@ -173,10 +173,10 @@ class SHT3xSensor : public SHTI2cSensor
   static const uint8_t SHT3X_I2C_ADDRESS_44 = 0x44;
   static const uint8_t SHT3X_I2C_ADDRESS_45 = 0x45;
 
-  SHT3xSensor(uint8_t i2cAddress = SHT3X_I2C_ADDRESS_44)
+  SHT3xSensor(TwoWire & wire, uint8_t i2cAddress = SHT3X_I2C_ADDRESS_44)
       : SHTI2cSensor(i2cAddress, SHT3X_ACCURACY_HIGH,
                      SHT3X_ACCURACY_HIGH_DURATION,
-                     -45, 175, 65535, 0, 100, 65535, 2)
+                     -45, 175, 65535, 0, 100, 65535, 2, wire)
   {
   }
 
@@ -222,10 +222,10 @@ class SHT4xSensor : public SHTI2cSensor
   static const uint8_t SHT4X_I2C_ADDRESS_44 = 0x44;
   static const uint8_t SHT4X_I2C_ADDRESS_45 = 0x45;
 
-  SHT4xSensor(uint8_t i2cAddress = SHT4X_I2C_ADDRESS_44)
+  SHT4xSensor(TwoWire & wire, uint8_t i2cAddress = SHT4X_I2C_ADDRESS_44)
       : SHTI2cSensor(i2cAddress, SHT4X_ACCURACY_HIGH,
                      SHT4X_ACCURACY_HIGH_DURATION,
-                     -45, 175, 65535, -6, 125, 65535, 1)
+                     -45, 175, 65535, -6, 125, 65535, 1, wire)
   {
   }
 
@@ -282,29 +282,29 @@ const SHTSensor::SHTSensorType SHTSensor::AUTO_DETECT_SENSORS[] = {
 const float SHTSensor::TEMPERATURE_INVALID = NAN;
 const float SHTSensor::HUMIDITY_INVALID = NAN;
 
-bool SHTSensor::init()
+bool SHTSensor::init(TwoWire & wire)
 {
   if (mSensor != NULL) {
     cleanup();
   }
 
   switch(mSensorType) {
     case SHT3X:
-      mSensor = new SHT3xSensor();
+      mSensor = new SHT3xSensor(wire);
       break;
 
     case SHT3X_ALT:
-      mSensor = new SHT3xSensor(SHT3xSensor::SHT3X_I2C_ADDRESS_45);
+      mSensor = new SHT3xSensor(wire, SHT3xSensor::SHT3X_I2C_ADDRESS_45);
       break;
 
     case SHTW1:
     case SHTW2:
     case SHTC1:
     case SHTC3:
-      mSensor = new SHTC1Sensor();
+      mSensor = new SHTC1Sensor(wire);
       break;
     case SHT4X:
-      mSensor = new SHT4xSensor();
+      mSensor = new SHT4xSensor(wire);
       break;
     case AUTO_DETECT:
     {

SHTSensor.h

@@ -30,6 +30,7 @@
 #define SHTSENSOR_H
 
 #include <inttypes.h>
+#include <Wire.h>
 
 // Forward declaration
 class SHTSensorDriver;
@@ -116,7 +117,7 @@ class SHTSensor
    *
    * Returns true if communication with a sensor on the bus was successful, false otherwise
    */
-  bool init();
+  bool init(TwoWire & wire = Wire);
 
   /**
    * Read new values from the sensor
@@ -153,7 +154,7 @@ class SHTSensor
 private:
   void cleanup();
 
-  
+
   SHTSensorDriver *mSensor;
   float mTemperature;
   float mHumidity;
@@ -201,7 +202,7 @@ class SHTSensorDriver
 class SHTI2cSensor : public SHTSensorDriver {
 public:
   /** Size of i2c commands to send */
-  
+
 
   /** Size of i2c replies to expect */
   static const uint8_t EXPECTED_DATA_SIZE;
@@ -219,9 +220,11 @@ class SHTI2cSensor : public SHTSensorDriver {
    */
   SHTI2cSensor(uint8_t i2cAddress, uint16_t i2cCommand, uint8_t duration,
                float a, float b, float c,
-               float x, float y, float z, uint8_t cmd_Size)
+               float x, float y, float z, uint8_t cmd_Size,
+               TwoWire & wire = Wire)
       : mI2cAddress(i2cAddress), mI2cCommand(i2cCommand), mDuration(duration),
-        mA(a), mB(b), mC(c), mX(x), mY(y), mZ(z), mCmd_Size(cmd_Size)
+        mA(a), mB(b), mC(c), mX(x), mY(y), mZ(z), mCmd_Size(cmd_Size),
+        mWire(wire)
   {
   }
 
@@ -241,10 +244,12 @@ class SHTI2cSensor : public SHTSensorDriver {
   float mY;
   float mZ;
   uint8_t mCmd_Size;
+  TwoWire & mWire;
 
 private:
   static uint8_t crc8(const uint8_t *data, uint8_t len);
-  static bool readFromI2c(uint8_t i2cAddress,
+  static bool readFromI2c(TwoWire & wire,
+                          uint8_t i2cAddress,
                           const uint8_t *i2cCommand,
                           uint8_t commandLength, uint8_t *data,
                           uint8_t dataLength, uint8_t duration);