Fix light sensor not recording to event for TSL2591

Author: brentru

src/components/i2c/controller.cpp

@@ -60,6 +60,11 @@ static const std::map<std::string, FnCreateI2CDriver> I2cFactory = {
         const char *driver_name) -> drvBase * {
        return new drvBme680(i2c, addr, mux_channel, driver_name);
      }},
+    {"bme688",
+     [](TwoWire *i2c, uint16_t addr, uint32_t mux_channel,
+        const char *driver_name) -> drvBase * {
+       return new drvBme680(i2c, addr, mux_channel, driver_name);
+     }},
     {"BMP280",
      [](TwoWire *i2c, uint16_t addr, uint32_t mux_channel,
         const char *driver_name) -> drvBase * {
@@ -195,6 +200,11 @@ static const std::map<std::string, FnCreateI2CDriver> I2cFactory = {
         const char *driver_name) -> drvBase * {
        return new drvScd4x(i2c, addr, mux_channel, driver_name);
      }},
+    {"scd41",
+     [](TwoWire *i2c, uint16_t addr, uint32_t mux_channel,
+        const char *driver_name) -> drvBase * {
+       return new drvScd4x(i2c, addr, mux_channel, driver_name);
+     }},
     {"scd30",
      [](TwoWire *i2c, uint16_t addr, uint32_t mux_channel,
         const char *driver_name) -> drvBase * {
@@ -470,7 +480,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
   if (strcmp(device_descriptor.i2c_bus_scl, "default") != 0) {
     WS_DEBUG_PRINTLN("[i2c] Non-default I2C bus specified!");
     if (_i2c_bus_alt == nullptr) {
-      WS_DEBUG_PRINT("[i2c] Initializing alternative i2c bus...");
+      WS_DEBUG_PRINTLN("[i2c] Initializing alternative i2c bus...");
       _i2c_bus_alt = new I2cHardware();
       _i2c_bus_alt->InitBus(false, device_descriptor.i2c_bus_sda,
                             device_descriptor.i2c_bus_scl);
@@ -595,6 +605,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
       WS_DEBUG_PRINTLN("[i2c] ERROR: I2C driver failed to initialize!");
       device_status =
           wippersnapper_i2c_I2cDeviceStatus_I2C_DEVICE_STATUS_FAIL_INIT;
+      // TODO: In offline mode, turn red and HALT
       if (!PublishI2cDeviceAddedorReplaced(device_descriptor, device_status))
         return false;
       return true;
@@ -603,6 +614,7 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     WS_DEBUG_PRINTLN("[i2c] ERROR: I2C driver type not found or unsupported!");
     device_status =
         wippersnapper_i2c_I2cDeviceStatus_I2C_DEVICE_STATUS_FAIL_UNSUPPORTED_SENSOR;
+    // TODO: In offline mode, turn red and HALT
     if (!PublishI2cDeviceAddedorReplaced(device_descriptor, device_status))
       return false;
     return true;

src/components/i2c/drivers/drvBase.h

@@ -15,7 +15,6 @@
 
 #ifndef DRV_BASE_H
 #define DRV_BASE_H
-#include "Wippersnapper_V2.h"
 #include <Adafruit_Sensor.h>
 #include <Arduino.h>
 #include <protos/i2c.pb.h>
@@ -566,7 +565,6 @@ class drvBase {
     return it->second(sensors_event);
   }
 
-  // private:
   //  Lambda function type for all GetEventX() function calls
   using fnGetEvent = std::function<bool(sensors_event_t *)>;
 

src/components/i2c/drivers/drvDps310.h

@@ -15,7 +15,7 @@
 
 #ifndef DRV_DPS310_H
 #define DRV_DPS310_H
-
+#include "Wippersnapper_V2.h"
 #include "drvBase.h"
 #include <Adafruit_DPS310.h>
 
@@ -63,19 +63,26 @@ class drvDps310 : public drvBase {
   bool begin() override {
     // initialize DPS310
     _dps310 = new Adafruit_DPS310();
-    if (!_dps310->begin_I2C((uint8_t)_address, _i2c))
-      return false;
+    if (!_dps310->begin_I2C((uint8_t)_address, _i2c)) {
+        WS_DEBUG_PRINTLN("DPS310 not found");
+        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)
-      return false;
+    if (_dps_temp == NULL) {
+        WS_DEBUG_PRINTLN("Temperature sensor not found");
+        return false;
+    }
     _dps_pressure = _dps310->getPressureSensor();
-    if (_dps_pressure == NULL)
-      return false;
-
+    if (_dps_pressure == NULL) {
+        WS_DEBUG_PRINTLN("Pressure sensor not found");
+        return false;
+    }
+    // Wait for the first reading to complete
+    delay(1000);
     return true;
   }
 
@@ -89,8 +96,10 @@ class drvDps310 : public drvBase {
   */
   /*******************************************************************************/
   bool getEventAmbientTemp(sensors_event_t *tempEvent) {
-    if (!_dps310->temperatureAvailable())
-      return false;
+    if (!_dps310->temperatureAvailable()) {
+        WS_DEBUG_PRINTLN("Temperature not available");
+        return false;
+    }
 
     _dps_temp->getEvent(tempEvent);
     return true;
@@ -106,8 +115,10 @@ class drvDps310 : public drvBase {
   */
   /*******************************************************************************/
   bool getEventPressure(sensors_event_t *pressureEvent) {
-    if (!_dps310->pressureAvailable())
-      return false;
+    if (!_dps310->pressureAvailable()) {
+        WS_DEBUG_PRINTLN("Pressure not available");
+        return false;
+    }
 
     _dps_pressure->getEvent(pressureEvent);
     return true;

src/components/i2c/model.cpp

@@ -217,6 +217,9 @@ float GetValueFromSensorsEvent(wippersnapper_sensor_SensorType sensor_type,
   case wippersnapper_sensor_SensorType_SENSOR_TYPE_UNITLESS_PERCENT:
     value = event->unitless_percent;
     break;
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_LIGHT:
+    value = event->light;
+    break;
   default:
     value = 0.0;
     break;