Offline/SD - Fix PM25 sensor

Author: brentru

src/components/uart/controller.cpp

@@ -57,6 +57,22 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
   // TODO: Have we already configured this UART hardware instance?!
   WS_DEBUG_PRINTLN("[uart] Configuring UART hardware instance...");
   wippersnapper_uart_UartSerialConfig cfg_serial = add_msg->cfg_serial;
+  // Print out the UART configuration for debugging
+  WS_DEBUG_PRINTLN("[uart] UART Serial Configuration:");
+  WS_DEBUG_PRINT("[uart] RX Pin: ");
+  WS_DEBUG_PRINTLN(cfg_serial.pin_rx);
+  WS_DEBUG_PRINT("[uart] TX Pin: ");
+  WS_DEBUG_PRINTLN(cfg_serial.pin_tx);
+  WS_DEBUG_PRINT("[uart] UART Number: ");
+  WS_DEBUG_PRINTLN(cfg_serial.uart_nbr);
+  WS_DEBUG_PRINT("[uart] Baud Rate: ");
+  WS_DEBUG_PRINTLN(cfg_serial.baud_rate);
+  WS_DEBUG_PRINT("[uart] Packet Format: ");
+  WS_DEBUG_PRINTLN(cfg_serial.format);
+  WS_DEBUG_PRINT("[uart] Timeout: ");
+  WS_DEBUG_PRINTLN(cfg_serial.timeout);
+  WS_DEBUG_PRINT("[uart] Use Software Serial: ");
+  WS_DEBUG_PRINTLN(cfg_serial.use_sw_serial ? "True" : "False");
   UARTHardware *uart_hardware = new UARTHardware(cfg_serial);
   if (!uart_hardware->ConfigureSerial()) {
     WS_DEBUG_PRINTLN("[uart] ERROR: Failed to configure UART hardware!");
@@ -128,7 +144,7 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
         cfg_device.config.pm25aqi.sensor_types,
         cfg_device.config.pm25aqi.sensor_types_count);
     uart_driver->SetSensorPeriod(cfg_device.config.pm25aqi.period);
-    WS_DEBUG_PRINT("added!");
+    WS_DEBUG_PRINTLN("added!");
     break;
   case wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_TM22XX:
     WS_DEBUG_PRINTLN("[uart] TM22XX device type not implemented!");
@@ -146,6 +162,7 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
   if (!is_gps_drv) {
     WS_DEBUG_PRINTLN("[uart] STD UART drv...");
     did_begin = uart_driver->begin();
+    WS_DEBUG_PRINTLN("[uart] STD UART driver initialized!");
     if (did_begin) {
       WS_DEBUG_PRINTLN("[uart] UART driver initialized successfully!");
       _uart_drivers.push_back(uart_driver);

src/components/uart/drivers/drvUartPm25.h

@@ -76,9 +76,14 @@ class drvUartPm25 : public drvUartBase {
       @returns  True if initialized successfully, False otherwise.
   */
   bool begin() override {
-    delay(3000); // Wait for the sensor to boot up
-                 /*     if (IsSoftwareSerial)
-                       return _pm25->begin_UART(_sw_serial); */
+    if (_hw_serial == nullptr)
+      return false;
+
+    _pm25 = new Adafruit_PM25AQI();
+    if (_pm25 == nullptr)
+        return false;
+
+    delay(1000); // Wait for the sensor to boot
     return _pm25->begin_UART(_hw_serial);
   }
 

src/provisioning/sdcard/ws_sdcard.cpp

@@ -474,7 +474,6 @@ uint32_t ws_sdcard::HexStrToInt(const char *hex_str) {
 */
 bool ws_sdcard::ParseUartAdd(JsonObject &component,
                              wippersnapper_uart_UartAdd &msg_uart_add) {
-  delay(5500);
   // Configure the Serial
   msg_uart_add.has_cfg_serial = true;
   snprintf(msg_uart_add.cfg_serial.pin_rx, sizeof(msg_uart_add.cfg_serial.pin_rx), 
@@ -523,7 +522,7 @@ bool ws_sdcard::ParseUartAdd(JsonObject &component,
           ParseSensorType(sensor_type["type"]);
       sensor_type_count++;
     }
-    msg_uart_add.cfg_device.config.generic_uart_input.sensor_types_count =
+    msg_uart_add.cfg_device.config.pm25aqi.sensor_types_count =
         sensor_type_count;
   } else if (strcmp(device_type, "GENERIC-INPUT") == 0) {
     // TODO: Fill device name (requires an update to uart.pb.h so it's not a
@@ -1427,16 +1426,10 @@ bool ws_sdcard::LogEventUart(
   doc["uart_device_id"] = msg_uart_input_event->device_id;
   doc["uart_port"] = msg_uart_input_event->uart_nbr;
 
-  WS_DEBUG_PRINT("UART Events: ");
-  WS_DEBUG_PRINTLN(msg_uart_input_event->events_count);
   // Log each event
   for (pb_size_t i = 0; i < msg_uart_input_event->events_count; i++) {
     doc["value"] = msg_uart_input_event->events[i].value.float_value;
     doc["si_unit"] = SensorTypeToSIUnit(msg_uart_input_event->events[i].type);
-    WS_DEBUG_PRINT("Logging UART Event: ");
-    WS_DEBUG_PRINTLN(doc["value"].as<float>());
-    WS_DEBUG_PRINT("SI Unit: ");
-    WS_DEBUG_PRINTLN(doc["si_unit"].as<const char *>());
   }
 
   if (!LogJSONDoc(doc))