Address @tyeth review for UART/GPS #1

Author: brentru

.github/workflows/release-offline.yml

@@ -214,7 +214,6 @@ jobs:
           git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg
           git clone --quiet https://github.com/pstolarz/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library
           git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
-          git clone --quiet --branch fix-for-pico https://github.com/brentru/SdFat.git /home/runner/Arduino/libraries/SdFat_-_Adafruit_Fork/
       - name: Download stable Nanopb
         id: download-nanopb
         continue-on-error: true

src/components/gps/controller.cpp

@@ -125,14 +125,6 @@ void GPSController::update() {
     return; // bail-out!
 
   for (GPSHardware *drv : _gps_drivers) {
-    // TODO: Commented out due to parsing failures, stability issue (failed to
-    // parse NMEA acks for this) Perform a keep-alive check by sending an
-    // antenna check command every 2 seconds
-    /*     if (millis() - drv->GetPrvKat() > 2000) {
-          drv->GetAdaGps()->sendCommand(CMD_MTK_CHECK_ANTENNA);
-          drv->SetPrvKat(millis());
-        } */
-
     // Did read period elapse?
     ulong cur_time = millis();
     if (cur_time - drv->GetPollPeriodPrv() < drv->GetPollPeriod())

src/components/gps/hardware.cpp

@@ -104,66 +104,7 @@ bool GPSHardware::Handle_GPSConfig(wippersnapper_gps_GPSConfig *gps_config) {
       }
     }
   } else if (_driver_type == GPS_DRV_UBLOX) {
-    WS_DEBUG_PRINTLN("[gps] Handling GPSConfig for U-Blox driver...");
     I2cReadDiscard();
-    // Iterate through the command sentences and send them to the GPS module
-    for (size_t i = 0; i < gps_config->commands_ubxes_count; i++) {
-      // TODO: Tuesday fix this frame decoder!
-      /*       pb_bytes_array_t *ubx_frame = &gps_config->commands_ubxes[i];
-            // Validate minimum frame size
-            if (ubx_frame->size < 8) {
-              WS_DEBUG_PRINT("[gps] Invalid UBX frame size: ");
-              WS_DEBUG_PRINTLN(ubx_frame->size);
-              continue;
-            }
-
-            // Validate sync bytes
-            if (ubx_frame->bytes[0] != 0xB5 || ubx_frame->bytes[1] != 0x62) {
-              WS_DEBUG_PRINTLN("[gps] Invalid UBX sync bytes");
-              continue;
-            }
-
-            // Validate frame size
-            size_t expectedSize = 8 + payloadLength;
-            if (ubx_frame->size != expectedSize) {
-              WS_DEBUG_PRINT("[gps] Frame size mismatch. Expected: ");
-              WS_DEBUG_PRINT(expectedSize);
-              WS_DEBUG_PRINT(", Got: ");
-              WS_DEBUG_PRINTLN(ubx_frame->size);
-              continue;
-            }
-
-            // Extract message components
-            uint8_t msgClass = ubx_frame->bytes[2];
-            uint8_t msgId = ubx_frame->bytes[3];
-            uint16_t payloadLength = ubx_frame->bytes[4] | (ubx_frame->bytes[5]
-         << 8);
-
-            // Get payload
-            uint8_t *payload = NULL;
-            if (payloadLength > 0) {
-              payload = &ubx_frame->bytes[6];
-            }
-
-            WS_DEBUG_PRINT("[gps] Sending UBX CMD #");
-            WS_DEBUG_PRINT(i);
-            WS_DEBUG_PRINT(" - Class: 0x");
-            WS_DEBUG_PRINT(msgClass, HEX);
-            WS_DEBUG_PRINT(", ID: 0x");
-            WS_DEBUG_PRINT(msgId, HEX);
-            WS_DEBUG_PRINT(", Payload len: ");
-            WS_DEBUG_PRINTLN(payloadLength);
-
-            // Send the message
-            UBXSendStatus status = _ubx_gps->sendMessageWithAck(msgClass, msgId,
-         payload, payloadLength);
-
-            if (status != UBXSendStatus::UBX_SEND_SUCCESS) {
-              WS_DEBUG_PRINTLN("[gps] Failed to send UBX message");
-            } else {
-              WS_DEBUG_PRINTLN("[gps] OK");
-            } */
-    }
   } else {
     WS_DEBUG_PRINTLN("[gps] ERROR: Unsupported GPS driver type!");
     return false;

src/components/uart/model.cpp

@@ -183,7 +183,25 @@ bool UARTModel::AddUartInputEvent(sensors_event_t &event,
     sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
     sensor_event.value.float_value = event.pm100_std;
     break;
-  // TODO: Add more cases for other sensor types
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE:
+    sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
+    sensor_event.value.float_value = event.temperature;
+    break;
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE:
+    sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
+    sensor_event.value.float_value = event.temperature;
+    break;
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE_FAHRENHEIT:
+    sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
+    sensor_event.value.float_value = event.temperature;
+    break;
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE_FAHRENHEIT:
+    sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
+    sensor_event.value.float_value = event.temperature;
+  case wippersnapper_sensor_SensorType_SENSOR_TYPE_PROXIMITY:
+    sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
+    sensor_event.value.float_value = event.distance;
+    break;
   default:
     sensor_event.which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
     sensor_event.value.float_value = event.data[0];

src/provisioning/sdcard/ws_sdcard.cpp

@@ -490,9 +490,12 @@ bool ws_sdcard::ParseUartAdd(JsonObject &component,
                                                                   // for now
   msg_uart_add.cfg_serial.timeout =
       component["timeout"] | 1000; // Use a default UART timeout of 1000ms
+
+#ifdef HAS_SOFTWARE_SERIAL
   msg_uart_add.cfg_serial.use_sw_serial = component["useSwSerial"] | false;
   msg_uart_add.cfg_serial.sw_serial_invert =
       component["swSerialInvert"] | false;
+#endif // HAS_SOFTWARE_SERIAL
 
   // Configure the UART Device
   msg_uart_add.has_cfg_device = true;