Switch SCD30 to use read() instead of getEvent()

Author: tyeth

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD30.h

@@ -95,10 +95,12 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    if (_scd->getEvent(&_humidity, &_temperature)) {
+    if (!_scd->read()) {
       return false;
     }
-    _CO2.CO2 = _scd->CO2;
+    _CO2 = _scd->CO2;
+    _humidity = _scd->relative_humidity;
+    _temperature = _scd->temperature;
     _lastRead = millis();
     return true;
   }
@@ -118,7 +120,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    tempEvent = &_temperature;
+    tempEvent->temperature = _temperature;
     return true;
   }
 
@@ -137,7 +139,7 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    humidEvent = &_humidity;
+    humidEvent->relative_humidity = _humidity;
     return true;
   }
 
@@ -156,16 +158,16 @@ class WipperSnapper_I2C_Driver_SCD30 : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-    co2Event = &_CO2;
+    co2Event->CO2 = _CO2;
     return true;
   }
 
 protected:
   Adafruit_SCD30 *_scd = nullptr; ///< SCD30 driver object
   ulong _lastRead = 0;            ///< Last time the sensor was read
-  sensors_event_t _temperature;   ///< Temperature
-  sensors_event_t _humidity;      ///< Relative Humidity
-  sensors_event_t _CO2;           ///< CO2
+  float _temperature;             ///< Temperature
+  float _humidity;                ///< Relative Humidity
+  float _CO2;                     ///< CO2
 };
 
 #endif // WipperSnapper_I2C_Driver_SCD30

src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD4X.h

@@ -120,7 +120,6 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
       return false;
     }
 
-
     // Read SCD4x measurement
     uint16_t error = _scd->readMeasurement(_co2, _temperature, _humidity);
     if (error != 0 || _co2 == 0) {
@@ -190,8 +189,8 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
 protected:
   SensirionI2CScd4x *_scd = nullptr; ///< SCD4x driver object
   uint16_t _co2 = 0;                 ///< SCD4x co2 reading
-  float _temperature = 20.0f;           ///< SCD4x temperature reading
-  float _humidity = 50.0f;              ///< SCD4x humidity reading
+  float _temperature = 20.0f;        ///< SCD4x temperature reading
+  float _humidity = 50.0f;           ///< SCD4x humidity reading
   ulong _lastRead = 0;               ///< Last time the sensor was read
 };