Offline/SD - Fix regression RP2040

Author: brentru

src/Wippersnapper_demo.ino

@@ -10,7 +10,8 @@
 // All text above must be included in any redistribution.
 
 #include "ws_adapters.h"
-ws_adapter_wifi wipper;
+//ws_adapter_wifi wipper;
+ws_adapter_offline wipper;
 #define WS_DEBUG // Enable debug output!
 
 void setup() {

src/components/uart/drivers/drvUartPm25.h

@@ -112,7 +112,7 @@ class drvUartPm25 : public drvUartBase {
   */
   bool getEventPM25_STD(sensors_event_t *pm25StdEvent) {
     PM25_AQI_Data data;
-    if (!_pm25->read(&data)) {
+    if (!_pm25->read(&data))
       return false; // couldn't read data
 
     pm25StdEvent->pm25_std = (float)data.pm25_standard;

src/components/uart/hardware.cpp

@@ -126,20 +126,37 @@ bool UARTHardware::ConfigureSerial() {
     _baud_rate = _config.baud_rate;
 #endif // HAS_SW_SERIAL
   } else {
+#if ARDUINO_ARCH_ESP32
     // Create a new HardwareSerial instance
     _hwSerial = new HardwareSerial(_config.uart_nbr);
-    if (_hwSerial == nullptr) {
-      WS_DEBUG_PRINTLN(
-          "[uart] ERROR: Failed to allocate HardwareSerial instance!");
+    if (_hwSerial == nullptr)
       return false;
-    }
-// Calls to HardwareSerial begin() differ based on the platform
-#if ARDUINO_ARCH_ESP32
     _hwSerial->begin((unsigned long)_config.baud_rate, (uint32_t)cfg, rx_pin,
                      tx_pin, false, (unsigned long)_config.timeout);
+#elif ARDUINO_ARCH_RP2040
+    // Create a new SerialUART instance
+    uart_inst_t *uart_hw = nullptr;
+    // determine which bus to use (RP2040 only supports 2 hardware UARTs)
+    if (_config.uart_nbr == 0) {
+      uart_hw = uart0;
+    } else if (_config.uart_nbr == 1) {
+      uart_hw = uart1;
+    } else {
+      WS_DEBUG_PRINTLN("[uart] ERROR: Invalid UART bus number specified!");
+      return false;
+    }
+    _hwSerial = new SerialUART(uart_hw, tx_pin, rx_pin);
+    if (_hwSerial == nullptr) {
+      return false;
+    }
+    _hwSerial->begin((unsigned long)_config.baud_rate, (uint32_t)cfg);
 #else
-    // RP2040, ESP8266, SAMD, and other platforms
+    // ESP8266, SAMD, and other platforms
     // take the default Arduino/Wiring API arguments
+    // Create a new HardwareSerial instance
+    _hwSerial = new HardwareSerial(_config.uart_nbr);
+    if (_hwSerial == nullptr)
+      return false;
     _hwSerial->begin((unsigned long)_config.baud_rate, (uint32_t)cfg);
 #endif
     _baud_rate = _config.baud_rate;

src/components/uart/hardware.h

@@ -17,6 +17,9 @@
 #include "Wippersnapper_V2.h"
 #include <Arduino.h>
 #include <HardwareSerial.h>
+#ifdef ARDUINO_ARCH_RP2040
+#include <SerialUART.h>
+#endif
 
 #if defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_SAMD) ||              \
     defined(ARDUINO_ARCH_ESP8266)
@@ -54,7 +57,11 @@ class UARTHardware {
 private:
   wippersnapper_uart_UartSerialConfig
       _config;                         ///< The UART serial configuration
+  #ifdef ARDUINO_ARCH_RP2040
+  SerialUART *_hwSerial = nullptr; ///< Pointer to the SerialUART instance
+  #else
   HardwareSerial *_hwSerial = nullptr; ///< HardwareSerial instance for this bus
+  #endif
 #if HAS_SW_SERIAL
   SoftwareSerial *_swSerial = nullptr; ///< SoftwareSerial instance for this bus
 #endif                                 // HAS_SW_SERIAL

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -439,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) {
-    HaltFilesystem("Could not create the config file!");
+    fsHalt("Could not create the config file!");
     return false;
   }
   _doc_cfg.shrinkToFit();
@@ -451,7 +451,7 @@ 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