Offline/SD - UART GPS, UART US-100 OK

Author: brentru

src/Wippersnapper_demo.ino

@@ -15,7 +15,7 @@ ws_adapter_wifi wipper;
 
 void setup() {
   Serial.begin(115200);
-  while (!Serial) delay(10);
+  while(!Serial);
   wipper.provision();
   wipper.connect();
 }

src/components/gps/hardware.cpp

@@ -323,14 +323,12 @@ bool GPSHardware::DetectMtkUart() {
   while (_hw_serial->available() > 0) {
     _hw_serial->read();
   }
-  _hw_serial->println(CMD_MTK_QUERY_FW);
+
   // Query MediaTek firmware version
-  // Wait for response
-  uint16_t timeout = 2000; // 1 second timeout
+  uint16_t timeout = MTK_QUERY_FW_TIMEOUT;
   while (_hw_serial->available() < MAX_NEMA_SENTENCE_LEN && timeout--) {
     delay(1);
   }
-
   if (timeout == 0)
     return false;
 

src/components/gps/hardware.h

@@ -24,6 +24,7 @@
 #define CMD_MTK_QUERY_FW_RESP                                                  \
   "$PMTK705" ///< Response from querying MediaTek firmware version without the
              ///< ReleaseStr
+#define MTK_QUERY_FW_TIMEOUT 2000 ///< Timeout for MediaTek firmware query in ms
 #define CMD_MTK_CHECK_ANTENNA "$PGCMD,33,1*6C" ///< Command to check antenna
 #define DEFAULT_MTK_NMEA_UPDATE_RATE 1  ///< Default NMEA update rate in Hz
 #define DEFAULT_MTK_NMEA_BAUD_RATE 9600 ///< Default NMEA baud rate in bits per

src/components/uart/controller.cpp

@@ -74,6 +74,8 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
   GPSController *drv_uart_gps = nullptr;
   bool is_gps_drv = false;
   wippersnapper_uart_UartDeviceConfig cfg_device = add_msg->cfg_device;
+  WS_DEBUG_PRINT("[UART DEBUG] cfg_device.device_type: ");
+  WS_DEBUG_PRINTLN(cfg_device.device_type);
   switch (cfg_device.device_type) {
   case wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_UNSPECIFIED:
     WS_DEBUG_PRINTLN("[uart] ERROR: Unspecified device type!");

src/provisioning/sdcard/ws_sdcard.cpp

@@ -474,12 +474,13 @@ 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;
-  strncpy(msg_uart_add.cfg_serial.pin_rx, component["pinRx"] | UNKNOWN_VALUE,
-          sizeof(msg_uart_add.cfg_serial.pin_rx) - 1);
-  strncpy(msg_uart_add.cfg_serial.pin_tx, component["pinTx"] | UNKNOWN_VALUE,
-          sizeof(msg_uart_add.cfg_serial.pin_tx) - 1);
+  snprintf(msg_uart_add.cfg_serial.pin_rx, sizeof(msg_uart_add.cfg_serial.pin_rx), 
+           "%d", component["pinRx"] | -1);
+  snprintf(msg_uart_add.cfg_serial.pin_tx, sizeof(msg_uart_add.cfg_serial.pin_tx), 
+           "%d", component["pinTx"] | -1);
   msg_uart_add.cfg_serial.uart_nbr = component["uartNbr"] | 0;
   msg_uart_add.cfg_serial.baud_rate = component["baudRate"] | 9600;
   msg_uart_add.cfg_serial.format =
@@ -1426,10 +1427,16 @@ 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))