Fix DPS, scd, memset issue

Author: brentru

src/components/i2c/controller.cpp

@@ -726,9 +726,12 @@ void I2cController::update() {
     // Read the driver's sensors
     _i2c_model->ClearI2cDeviceEvent();
     for (size_t i = 0; i < sensor_count; i++) {
-      sensors_event_t event;
-      // Call the driver's handler function for the SensorType
-      drv->GetSensorEvent(drv->_sensors[i], &event);
+      sensors_event_t event = {0};
+      // Attempt to call driver's read handler function
+      if (!drv->GetSensorEvent(drv->_sensors[i], &event)) {
+        WS_DEBUG_PRINTLN("[i2c] ERROR: Failed to read sensor!");
+        continue;
+      }
       // Fill the I2cDeviceEvent's sensor_event array submsg.
       _i2c_model->AddI2cDeviceSensorEvent(event, drv->_sensors[i]);
     }

src/components/i2c/drivers/drvDps310.h

@@ -48,6 +48,7 @@ class drvDps310 : public drvBase {
     _i2c_mux_channel = mux_channel;
     strncpy(_name, driver_name, sizeof(_name) - 1);
     _name[sizeof(_name) - 1] = '\0';
+    _last_read = 0;
   }
 
   /*******************************************************************************/
@@ -81,8 +82,38 @@ class drvDps310 : public drvBase {
     if (_dps_pressure == NULL) {
       return false;
     }
-    // Wait for the first reading to complete
-    delay(1000);
+    return true;
+  }
+
+  /*******************************************************************************/
+  /*!
+      @brief    Reads the DPS310's temperature and pressure.
+      @returns  True if the measurements were read successfully, False
+     otherwise.
+  */
+  /*******************************************************************************/
+  bool alreadyRecentlyRead() {
+    return (_last_read != 0 && (millis() - _last_read < 1000));
+  }
+
+  /*******************************************************************************/
+  /*!
+      @brief    Reads the DPS310's temperature and pressure.
+      @returns  True if the measurements were read successfully, False
+     otherwise.
+  */
+  /*******************************************************************************/
+  bool ReadMeasurements() {
+    if (alreadyRecentlyRead())
+      return true;
+
+    while (!_dps310->temperatureAvailable() || !_dps310->pressureAvailable())
+      return false;
+
+    if (!_dps310->getEvents(&_temp_event, &_pressure_event))
+      return false;
+
+    _last_read = millis();
     return true;
   }
 
@@ -96,11 +127,10 @@ class drvDps310 : public drvBase {
   */
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
-    if (!_dps310->temperatureAvailable()) {
+    if (!ReadMeasurements()) {
       return false;
     }
-
-    _dps_temp->getEvent(tempEvent);
+    tempEvent->temperature = _temp_event.temperature;
     return true;
   }
 
@@ -114,15 +144,16 @@ class drvDps310 : public drvBase {
   */
   /*******************************************************************************/
   bool getEventPressure(sensors_event_t *pressureEvent) {
-    if (!_dps310->pressureAvailable()) {
+    if (!ReadMeasurements()) {
       return false;
     }
-
-    _dps_pressure->getEvent(pressureEvent);
+    pressureEvent->pressure = _pressure_event.pressure;
     return true;
   }
 
 protected:
+  sensors_event_t _temp_event, _pressure_event;
+  ulong _last_read;
   Adafruit_DPS310 *_dps310; ///< DPS310 driver object
   Adafruit_Sensor *_dps_temp =
       NULL; ///< Holds data for the DPS310's temperature sensor

src/components/i2c/drivers/drvScd30.h

@@ -40,7 +40,8 @@ class drvScd30 : public drvBase {
                 The name of the driver.
   */
   /*******************************************************************************/
-  drvScd30(TwoWire *i2c, uint16_t sensorAddress, uint32_t mux_channel, const char* driver_name)
+  drvScd30(TwoWire *i2c, uint16_t sensorAddress, uint32_t mux_channel,
+           const char *driver_name)
       : drvBase(i2c, sensorAddress, mux_channel, driver_name) {
     _i2c = i2c;
     _address = sensorAddress;
@@ -60,6 +61,58 @@ class drvScd30 : public drvBase {
     return _scd->begin((uint8_t)_address, _i2c);
   }
 
+  /*******************************************************************************/
+  /*!
+      @brief    Checks if sensor was read within last 1s, or is the first read.
+      @returns  True if the sensor was recently read, False otherwise.
+  */
+  bool hasBeenReadInLastSecond() {
+    return _lastRead != 0 && millis() - _lastRead < 1000;
+  }
+
+  /*******************************************************************************/
+  /*!
+      @brief    Checks if the sensor is ready to be read
+      @returns  True if the sensor is ready, False otherwise.
+  */
+  /*******************************************************************************/
+  bool isSensorReady() {
+    if (!_scd->dataReady()) {
+      // failed, one more quick attempt
+      delay(100);
+      if (!_scd->dataReady()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /*******************************************************************************/
+  /*!
+      @brief    Reads the SCD30 sensor.
+      @returns  True if the sensor was read successfully, False otherwise.
+  */
+  /*******************************************************************************/
+  bool readSensorData() {
+    // dont read sensor more than once per second
+    if (hasBeenReadInLastSecond()) {
+      return true;
+    }
+
+    if (!isSensorReady()) {
+      return false;
+    }
+
+    if (!_scd->read()) {
+      return false;
+    }
+    _CO2 = _scd->CO2;
+    _humidity = _scd->relative_humidity;
+    _temperature = _scd->temperature;
+    _lastRead = millis();
+    return true;
+  }
+
   /*******************************************************************************/
   /*!
       @brief    Gets the SCD30's current temperature.
@@ -71,14 +124,11 @@ class drvScd30 : public drvBase {
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
     // check if sensor is enabled and data is available
-    if (!_scd->dataReady())
-      return false;
-
-    // attempt to get temperature data
-    sensors_event_t humidEvent;
-    if (!_scd->getEvent(&humidEvent, tempEvent))
+    if (!readSensorData()) {
       return false;
+    }
 
+    tempEvent->temperature = _temperature;
     return true;
   }
 
@@ -93,14 +143,11 @@ class drvScd30 : public drvBase {
   /*******************************************************************************/
   bool getEventRelativeHumidity(sensors_event_t *humidEvent) {
     // check if sensor is enabled and data is available
-    if (!_scd->dataReady())
-      return false;
-
-    // attempt to get temperature data
-    sensors_event_t tempEvent;
-    if (!_scd->getEvent(humidEvent, &tempEvent))
+    if (!readSensorData()) {
       return false;
+    }
 
+    humidEvent->relative_humidity = _humidity;
     return true;
   }
 
@@ -115,15 +162,20 @@ class drvScd30 : public drvBase {
   /*******************************************************************************/
   bool getEventCO2(sensors_event_t *co2Event) {
     // check if sensor is enabled and data is available
-    if (!_scd->dataReady())
+    if (!readSensorData()) {
       return false;
+    }
 
-    co2Event->CO2 = _scd->CO2;
+    co2Event->CO2 = _CO2;
     return true;
   }
 
 protected:
-  Adafruit_SCD30 *_scd; ///< SCD30 driver object
+  Adafruit_SCD30 *_scd = nullptr; ///< SCD30 driver object
+  ulong _lastRead = 0;            ///< Last time the sensor was read
+  float _temperature;             ///< Temperature
+  float _humidity;                ///< Relative Humidity
+  float _CO2;                     ///< CO2
 };
 
 #endif // drvScd30