Fix for SCD40, SCD41

Author: brentru

src/components/i2c/drivers/drvDps310.h

@@ -15,7 +15,6 @@
 
 #ifndef DRV_DPS310_H
 #define DRV_DPS310_H
-#include "Wippersnapper_V2.h"
 #include "drvBase.h"
 #include <Adafruit_DPS310.h>
 
@@ -64,22 +63,19 @@ class drvDps310 : public drvBase {
     // initialize DPS310
     _dps310 = new Adafruit_DPS310();
     if (!_dps310->begin_I2C((uint8_t)_address, _i2c)) {
-        WS_DEBUG_PRINTLN("DPS310 not found");
-        return false;
+      return false;
     }
 
     // init OK, perform sensor configuration
     _dps310->configureTemperature(DPS310_64HZ, DPS310_64SAMPLES);
     _dps310->configurePressure(DPS310_64HZ, DPS310_64SAMPLES);
     _dps_temp = _dps310->getTemperatureSensor();
     if (_dps_temp == NULL) {
-        WS_DEBUG_PRINTLN("Temperature sensor not found");
-        return false;
+      return false;
     }
     _dps_pressure = _dps310->getPressureSensor();
     if (_dps_pressure == NULL) {
-        WS_DEBUG_PRINTLN("Pressure sensor not found");
-        return false;
+      return false;
     }
     // Wait for the first reading to complete
     delay(1000);
@@ -97,8 +93,7 @@ class drvDps310 : public drvBase {
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
     if (!_dps310->temperatureAvailable()) {
-        WS_DEBUG_PRINTLN("Temperature not available");
-        return false;
+      return false;
     }
 
     _dps_temp->getEvent(tempEvent);
@@ -116,8 +111,7 @@ class drvDps310 : public drvBase {
   /*******************************************************************************/
   bool getEventPressure(sensors_event_t *pressureEvent) {
     if (!_dps310->pressureAvailable()) {
-        WS_DEBUG_PRINTLN("Pressure not available");
-        return false;
+      return false;
     }
 
     _dps_pressure->getEvent(pressureEvent);

src/components/i2c/drivers/drvScd4x.h

@@ -17,6 +17,7 @@
 #ifndef DRV_SCD4X_H
 #define DRV_SCD4X_H
 
+#include "Wippersnapper_V2.h"
 #include "drvBase.h"
 #include <SensirionI2CScd4x.h>
 #include <Wire.h>
@@ -38,7 +39,8 @@ class drvScd4x : public drvBase {
                 7-bit device address.
   */
   /*******************************************************************************/
-  drvScd4x(TwoWire *i2c, uint16_t sensorAddress, uint32_t mux_channel, const char* driver_name)
+  drvScd4x(TwoWire *i2c, uint16_t sensorAddress, uint32_t mux_channel,
+           const char *driver_name)
       : drvBase(i2c, sensorAddress, mux_channel, driver_name) {
     _i2c = i2c;
     _address = sensorAddress;
@@ -58,12 +60,16 @@ class drvScd4x : public drvBase {
     _scd->begin(*_i2c);
 
     // stop previously started measurement
-    if (_scd->stopPeriodicMeasurement())
+    if (_scd->stopPeriodicMeasurement()) {
+      WS_DEBUG_PRINTLN("Unable to L63");
       return false;
+    }
 
     // start measurements
-    if (_scd->startPeriodicMeasurement())
+    if (_scd->startPeriodicMeasurement()) {
+      WS_DEBUG_PRINTLN("Unable to L69");
       return false;
+    }
 
     return true;
   }
@@ -82,13 +88,15 @@ class drvScd4x : public drvBase {
 
     // Check if data is ready
     error = _scd->getDataReadyFlag(isDataReady);
-    if (error || !isDataReady)
+    if (error || !isDataReady) {
       return false;
+    }
 
     // Read SCD4x measurement
     error = _scd->readMeasurement(_co2, _temperature, _humidity);
-    if (error || _co2 == 0)
+    if (error || _co2 == 0) {
       return false;
+    }
 
     return true;
   }
@@ -104,9 +112,7 @@ class drvScd4x : public drvBase {
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
     // read all sensor measurements
-    if (!readSensorMeasurements())
-      return false;
-
+    readSensorMeasurements();
     tempEvent->temperature = _temperature;
     return true;
   }
@@ -122,9 +128,7 @@ class drvScd4x : public drvBase {
   /*******************************************************************************/
   bool getEventRelativeHumidity(sensors_event_t *humidEvent) {
     // read all sensor measurements
-    if (!readSensorMeasurements())
-      return false;
-
+    readSensorMeasurements();
     humidEvent->relative_humidity = _humidity;
     return true;
   }
@@ -140,9 +144,7 @@ class drvScd4x : public drvBase {
   /*******************************************************************************/
   bool getEventCO2(sensors_event_t *co2Event) {
     // read all sensor measurements
-    if (!readSensorMeasurements())
-      return false;
-
+    readSensorMeasurements();
     co2Event->CO2 = (float)_co2;
     return true;
   }