Offline/SD - Fix small regression in fs

Author: brentru

src/components/uart/drivers/drvUartPm25.h

@@ -96,16 +96,10 @@ class drvUartPm25 : public drvUartBase {
   */
   bool getEventPM10_STD(sensors_event_t *pm10StdEvent) {
     PM25_AQI_Data data;
-    if (!_pm25->read(&data)) {
-      // TODO: Debug - remove for production PR
-      WS_DEBUG_PRINTLN("Failed to read PM10STD data");
+    if (!_pm25->read(&data))
       return false; // couldn't read data
-    }
 
     pm10StdEvent->pm10_std = (float)data.pm10_standard;
-    // TODO: Debug - remove for production PR
-    WS_DEBUG_PRINT("PM10STD: ");
-    WS_DEBUG_PRINTLN(pm10StdEvent->pm10_std);
     return true;
   }
 
@@ -119,14 +113,9 @@ class drvUartPm25 : public drvUartBase {
   bool getEventPM25_STD(sensors_event_t *pm25StdEvent) {
     PM25_AQI_Data data;
     if (!_pm25->read(&data)) {
-      // TODO: Debug - remove for production PR
-      WS_DEBUG_PRINTLN("Failed to read PM25STD data");
       return false; // couldn't read data
-    }
+
     pm25StdEvent->pm25_std = (float)data.pm25_standard;
-    // TODO: Debug - remove for production PR
-    WS_DEBUG_PRINT("PM25STD: ");
-    WS_DEBUG_PRINTLN(pm25StdEvent->pm25_std);
     return true;
   }
 
@@ -139,16 +128,10 @@ class drvUartPm25 : public drvUartBase {
   */
   bool getEventPM100_STD(sensors_event_t *pm100StdEvent) {
     PM25_AQI_Data data;
-    if (!_pm25->read(&data)) {
-      // TODO: Debug - remove for production PR
-      WS_DEBUG_PRINTLN("Failed to read PM100STD data");
+    if (!_pm25->read(&data))
       return false; // couldn't read data
-    }
 
     pm100StdEvent->pm100_std = (float)data.pm100_standard;
-    // TODO: Debug - remove for production PR
-    WS_DEBUG_PRINT("PM100STD: ");
-    WS_DEBUG_PRINTLN(pm100StdEvent->pm100_std);
     return true;
   }
 

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -422,6 +422,7 @@ void Wippersnapper_FS::AddI2cDeviceToFileConfig(
   }
 }
 
+
 /*!
     @brief    Writes the in-memory config document to the filesystem.
     @returns  True if the file was successfully written, False otherwise.
@@ -438,7 +439,7 @@ bool Wippersnapper_FS::WriteFileConfig() {
   // Write the document to the filesystem
   File32 file_cfg = wipperFatFs_v2.open("/config.json", FILE_WRITE);
   if (!file_cfg) {
-    fsHalt("Could not create the config file!");
+    HaltFilesystem("Could not create the config file!");
     return false;
   }
   _doc_cfg.shrinkToFit();
@@ -450,11 +451,10 @@ bool Wippersnapper_FS::WriteFileConfig() {
   flash_v2.syncBlocks();
   refreshMassStorage();
   delay(500);
-  initUSBMSC();
+  InitUsbMsc();
   WS_PRINTER.flush();
   delay(2500);
-  WS_PRINTER.println("Config file written to flash!"); // List current config /
-                                                       // components and periods
+  WS_PRINTER.println("Config file written to flash!"); // List current config / components and periods
   WsV2._i2c_controller->PrintAllDrivers();
   return true;
 }