GPS -detecting mtk

Author: brentru

src/components/gps/controller.cpp

@@ -158,10 +158,17 @@ bool GPSController::DetectMediatek() {
   char buffer[buf_len];
   size_t available = _uart_hardware->GetHardwareSerial()->available();
   size_t bytes_to_read = min(available, buf_len - 1);
+  // Print the two out
+  WS_DEBUG_PRINT("[gps] Reading MediaTek GPS response: ");
+  WS_DEBUG_PRINT(available);
+  WS_DEBUG_PRINT(" bytes, reading ");
+  WS_DEBUG_PRINTLN(bytes_to_read);
   for (size_t i = 0; i < bytes_to_read; i++) {
     buffer[i] = _uart_hardware->GetHardwareSerial()->read();
   }
   buffer[bytes_to_read] = '\0';
+  WS_DEBUG_PRINT("[gps] MediaTek GPS response: ");
+  WS_DEBUG_PRINTLN(buffer);
   // Compare the first 7 characters to the expected PMTK705 string
   if (strncmp(buffer, CMD_MTK_QUERY_FW_RESP, 7) != 0) {
     return false;

src/components/gps/controller.h

@@ -22,8 +22,8 @@
 #define CMD_MTK_QUERY_FW                                                       \
   "$PMTK605*31" ///< Request to query MediaTek firmware version
 #define CMD_MTK_QUERY_FW_RESP                                                  \
-  "PMTK705" ///< Response from querying MediaTek firmware version without the
-            ///< ReleaseStr
+  "$PMTK705" ///< Response from querying MediaTek firmware version without the
+             ///< ReleaseStr
 #define MAX_NEMA_SENTENCE_LEN 82 ///< Maximum length of a NMEA sentence
 
 class Wippersnapper_V2; ///< Forward declaration

src/components/uart/controller.cpp

@@ -68,18 +68,9 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
   WS_DEBUG_PRINTLN("[uart] UART hardware instance configured successfully!");
 
   // Create a new UartDevice "driver" on the hardware layer (UARTHardware)
-  wippersnapper_uart_UartDeviceConfig cfg_device = add_msg->cfg_device;
-  WS_DEBUG_PRINT("cfg_device.device_type: ");
-  WS_DEBUG_PRINTLN(cfg_device.device_type);
   drvUartBase *uart_driver = nullptr;
-
-  // tODO: Am seeing an issue where device_id causes a crash
-  // uncomment below:
-  // WS_DEBUG_PRINT("cfg_device.device_id: ");
-  // WS_DEBUG_PRINTLN(cfg_device.device_id);
-
-  /*
-  // TODO: Monday, Crash occurs here, no idea why yet
+  wippersnapper_uart_UartDeviceConfig cfg_device = add_msg->cfg_device;
+  GPSController gps; // TODO: This should be a member variable, not a local one
   switch (cfg_device.device_type) {
   case wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_UNSPECIFIED:
     WS_DEBUG_PRINTLN("[uart] ERROR: Unspecified device type!");
@@ -111,8 +102,26 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
     return false;
   case wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_GPS:
     WS_DEBUG_PRINTLN("[uart] GPS device type not implemented!");
-    delete uart_hardware; // cleanup
-    return false;
+    // delete uart_hardware; // cleanup
+    // return false;
+
+    WS_DEBUG_PRINTLN("[uart] Adding GPS device..");
+    if (!gps.SetInterface(uart_hardware)) {
+      WS_DEBUG_PRINTLN("[uart] ERROR: Failed to set GPS interface!");
+      delete uart_hardware; // cleanup
+      return false;
+    }
+    WS_DEBUG_PRINTLN("[uart] Initializing GPS device...");
+    if (!gps.begin()) {
+      WS_DEBUG_PRINTLN("[uart] ERROR: Failed to initialize GPS device!");
+      delete uart_hardware; // cleanup
+      return false;
+    }
+    WS_DEBUG_PRINTLN("[uart] GPS device initialized successfully!");
+    // TODO: Figure out how to add this to the drivers  list so it can be
+    // queried, also this is sitting on the stack instead of the heap, so it
+    // will be destroyed when this function returns!!!
+    break;
   case wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_PM25AQI:
     WS_DEBUG_PRINTLN("[uart] Adding PM2.5 AQI device..");
     // Create a new PM2.5 AQI driver instance
@@ -136,6 +145,7 @@ bool UARTController::Handle_UartAdd(pb_istream_t *stream) {
     return false;
   }
 
+  /*
   // Attempt to initialize the UART driver
   if (uart_driver == nullptr) {
     WS_DEBUG_PRINTLN("[uart] ERROR: Failed to create UART driver!");

src/components/uart/controller.h

@@ -24,6 +24,7 @@
 #include "drivers/drvUartUs100.h"
 
 class Wippersnapper_V2; ///< Forward declaration
+class GPSController;
 class UARTModel;        ///< Forward declaration
 class UARTHardware;     ///< Forward declaration
 

src/protos/gps.pb.c

@@ -6,7 +6,7 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(wippersnapper_gps_GPSConfig, wippersnapper_gps_GPSConfig, 4)
+PB_BIND(wippersnapper_gps_GPSConfig, wippersnapper_gps_GPSConfig, 2)
 
 
 PB_BIND(wippersnapper_gps_GPSDateTime, wippersnapper_gps_GPSDateTime, AUTO)

src/protos/gps.pb.h

@@ -17,7 +17,7 @@
 typedef struct _wippersnapper_gps_GPSConfig {
     /* Baud rate is not included here as it is included in the UartAdd->UartSerialConfig message. */
     pb_size_t commands_count;
-    char commands[16][256]; /* * List of commands to configure the GPS * */
+    char commands[16][90]; /* * List of commands to configure the GPS * */
 } wippersnapper_gps_GPSConfig;
 
 /* * GPSDateTime represents the date and time information from a GPRMC/GPGGA string * */
@@ -161,7 +161,7 @@ extern const pb_msgdesc_t wippersnapper_gps_GPGGAResponse_msg;
 /* Maximum encoded size of messages (where known) */
 #define WIPPERSNAPPER_GPS_GPS_PB_H_MAX_SIZE      wippersnapper_gps_GPSConfig_size
 #define wippersnapper_gps_GPGGAResponse_size     168
-#define wippersnapper_gps_GPSConfig_size         4128
+#define wippersnapper_gps_GPSConfig_size         1456
 #define wippersnapper_gps_GPSDateTime_size       77
 #define wippersnapper_gps_GPSRMCResponse_size    139
 

src/protos/signal.pb.c

@@ -6,7 +6,7 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(wippersnapper_signal_BrokerToDevice, wippersnapper_signal_BrokerToDevice, 4)
+PB_BIND(wippersnapper_signal_BrokerToDevice, wippersnapper_signal_BrokerToDevice, 2)
 
 
 PB_BIND(wippersnapper_signal_DeviceToBroker, wippersnapper_signal_DeviceToBroker, 4)

src/protos/uart.pb.c

@@ -18,10 +18,10 @@ PB_BIND(wippersnapper_uart_TrinamicDynamixelConfig, wippersnapper_uart_TrinamicD
 PB_BIND(wippersnapper_uart_PM25AQIConfig, wippersnapper_uart_PM25AQIConfig, AUTO)
 
 
-PB_BIND(wippersnapper_uart_UartDeviceConfig, wippersnapper_uart_UartDeviceConfig, 4)
+PB_BIND(wippersnapper_uart_UartDeviceConfig, wippersnapper_uart_UartDeviceConfig, 2)
 
 
-PB_BIND(wippersnapper_uart_UartAdd, wippersnapper_uart_UartAdd, 4)
+PB_BIND(wippersnapper_uart_UartAdd, wippersnapper_uart_UartAdd, 2)
 
 
 PB_BIND(wippersnapper_uart_UartAdded, wippersnapper_uart_UartAdded, AUTO)