Offline - GPS over I2C working for PA1010D, UBX MAX-M10

Author: brentru

src/components/gps/controller.cpp

@@ -120,15 +120,7 @@ void GPSController::update() {
         } */
 
     // Did read period elapse?
-    // TODO: Why is it constantly polling the GPS hardware from the config.json?
-    // Is this a bug with setting the poll period? Print it out
     ulong cur_time = millis();
-    WS_DEBUG_PRINT("drv->GetPollPeriodPrv(): ");
-    WS_DEBUG_PRINT(drv->GetPollPeriodPrv());
-    WS_DEBUG_PRINT(" drv->GetPollPeriod(): ");
-    WS_DEBUG_PRINTLN(drv->GetPollPeriod());
-    WS_DEBUG_PRINT("cur_time: ");
-    WS_DEBUG_PRINTLN(cur_time);
     if (cur_time - drv->GetPollPeriodPrv() < drv->GetPollPeriod())
       continue; // Not yet elapsed, skip this driver
 
@@ -145,16 +137,13 @@ void GPSController::update() {
     bool has_gps_event = false;
     while (drv->NmeaBufPop(nmea_sentence) != -1) {
       // Let the driver parse the NMEA sentence
-      WS_DEBUG_PRINT("[gps] Parsing NMEA sentence: ");
-      WS_DEBUG_PRINTLN(nmea_sentence);
       if (!drv->ParseNMEASentence(nmea_sentence)) {
         continue; // Skip this sentence if parsing failed
       } else {
         has_gps_event = true; // We have a valid NMEA sentence
       }
 
       // Using the Model, process the NMEA sentence into a GPSEvent
-      WS_DEBUG_PRINTLN("[gps] Processing NMEA sentence...");
       _gps_model->ProcessNMEASentence(nmea_sentence, drv);
 
       // We did not create a GPSEvent because the NMEA sentences were not
@@ -177,13 +166,9 @@ void GPSController::update() {
           }
         } else {
           // Log the GPSEvent to SD card
-          WS_DEBUG_PRINT("[gps] Logging GPSEvent to SD card...");
-          /*           if
-             (!WsV2._sdCardV2->LogEventGps(_gps_model->GetGPSEvent())) {
-                        WS_DEBUG_PRINTLN("[gps] ERROR: Failed to log GPSEvent to
-             SD!"); statusLEDSolid(WS_LED_STATUS_FS_WRITE); } else {
-                        WS_DEBUG_PRINTLN("OK!");
-                    } */
+          if (!WsV2._sdCardV2->LogEventGps(_gps_model->GetGPSEvent())) {
+            WS_DEBUG_PRINTLN("[gps] ERROR: Failed to log GPSEvent!");
+          }
         }
       } else {
         WS_DEBUG_PRINTLN("[gps] ERROR: Failed to encode GPSEvent!");

src/components/gps/hardware.cpp

@@ -542,9 +542,6 @@ void GPSHardware::PollStoreSentences() {
     }
   } else if (_driver_type == GPS_DRV_UBLOX) {
     // Read from the GPS module for update_rate milliseconds
-    // TODO: Too many calls to WS_DEBUG
-    // TOO: Maybe just delay for update_rate instead of constantly polling the
-    // hw serial for avability? more performant
     ulong update_rate = 1000 / _nmea_update_rate;
     ulong start_time = millis();
     while (millis() - start_time < update_rate) {
@@ -564,10 +561,7 @@ void GPSHardware::PollStoreSentences() {
       nmeaBuffer += c;
       // Check for end of NMEA sentence
       if (c == '\n') {
-        WS_DEBUG_PRINT("[gps] GOT NMEA sentence: ");
-        WS_DEBUG_PRINTLN(nmeaBuffer.c_str());
         // Push the NMEA sentence to the buffer
-        WS_DEBUG_PRINTLN("[gps] Pushing NMEA sentence to buffer...");
         if (NmeaBufPush(nmeaBuffer.c_str()) != 0) {
           WS_DEBUG_PRINTLN(
               "[gps] ERROR: Unable to push NMEA sentence to buffer!");

src/components/gps/model.cpp

@@ -206,34 +206,6 @@ bool GPSModel::ProcessNMEASentence(char *sentence, GPSHardware *drv) {
   char lat_dir = drv->GetLatDir();
   char lon_dir = drv->GetLonDir();
   if (sentence[3] == 'R' && sentence[4] == 'M' && sentence[5] == 'C') {
-    // Debug prints for Sentence variabesl
-    WS_DEBUG_PRINTLN("[gps] Processing RMC sentence...");
-    WS_DEBUG_PRINT("[gps] Hour: ");
-    WS_DEBUG_PRINTLN(drv->GetHour());
-    WS_DEBUG_PRINT("[gps] Minute: ");
-    WS_DEBUG_PRINTLN(drv->GetMinute());
-    WS_DEBUG_PRINT("[gps] Seconds: ");
-    WS_DEBUG_PRINTLN(drv->GetSeconds());
-    WS_DEBUG_PRINT("[gps] Milliseconds: ");
-    WS_DEBUG_PRINTLN(drv->GetMilliseconds());
-    WS_DEBUG_PRINT("[gps] Day: ");
-    WS_DEBUG_PRINTLN(drv->GetDay());
-    WS_DEBUG_PRINT("[gps] Month: ");
-    WS_DEBUG_PRINTLN(drv->GetMonth());
-    WS_DEBUG_PRINT("[gps] Year: ");
-    WS_DEBUG_PRINTLN(drv->GetYear());
-    WS_DEBUG_PRINT("[gps] Latitude: ");
-    WS_DEBUG_PRINTLN(drv->GetLat());
-    WS_DEBUG_PRINT("[gps] Latitude Direction: ");
-    WS_DEBUG_PRINTLN(lat_dir);
-    WS_DEBUG_PRINT("[gps] Longitude: ");
-    WS_DEBUG_PRINTLN(drv->GetLon());
-    WS_DEBUG_PRINT("[gps] Longitude Direction: ");
-    WS_DEBUG_PRINTLN(lon_dir);
-    WS_DEBUG_PRINT("[gps] Speed: ");
-    WS_DEBUG_PRINTLN(drv->GetSpeed());
-    WS_DEBUG_PRINT("[gps] Angle: ");
-    WS_DEBUG_PRINTLN(drv->GetAngle());
     // Process RMC sentence
     if (!AddGpsEventRMC(datetime, drv->GetFix(), drv->GetLat(), &lat_dir,
                         drv->GetLon(), &lon_dir, drv->GetSpeed(),

src/components/i2c/controller.cpp

@@ -1378,7 +1378,6 @@ void I2cController::update() {
 
     // Optionally configure the I2C MUX
     uint32_t mux_channel = drv->GetMuxChannel();
-    WS_DEBUG_PRINTLN(mux_channel);
     if (drv->HasMux())
       ConfigureMuxChannel(mux_channel, drv->HasAltI2CBus());
 

src/provisioning/sdcard/ws_sdcard.cpp

@@ -499,8 +499,10 @@ bool ws_sdcard::ParseUartAdd(JsonObject &component,
   // set UartDeviceType
   const char *device_type = component["deviceType"] | "UNKNOWN";
   if (strcmp(device_type, "GPS") == 0) {
-    msg_uart_add.cfg_device.device_type = wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_GPS;
-    msg_uart_add.cfg_device.which_config = wippersnapper_uart_UartDeviceConfig_gps_tag;
+    msg_uart_add.cfg_device.device_type =
+        wippersnapper_uart_UartDeviceType_UART_DEVICE_TYPE_GPS;
+    msg_uart_add.cfg_device.which_config =
+        wippersnapper_uart_UartDeviceConfig_gps_tag;
     msg_uart_add.cfg_device.config.gps.period = component["period"] | 0.0;
     // TODO: We do not have parsing for GPS PMTK or UBX implemented yet
     // This is a minimum possible implementation
@@ -907,7 +909,6 @@ bool ws_sdcard::ParseFileConfig() {
 */
 /**************************************************************************/
 bool ws_sdcard::ParseComponents(JsonArray &components) {
-  delay(9000);
   if (components.isNull()) {
     WS_DEBUG_PRINTLN("[SD] Error: File missing required components[] array");
     return false;
@@ -1359,7 +1360,6 @@ bool ws_sdcard::LogEventGps(wippersnapper_gps_GPSEvent *msg_gps_event) {
   // Log RMC responses
   for (pb_size_t rmc_resp = 0; rmc_resp < msg_gps_event->rmc_responses_count;
        rmc_resp++) {
-    WS_DEBUG_PRINTLN("[SD] Logging RMC response...");
     // Log GPS DateTime
     if (msg_gps_event->rmc_responses[rmc_resp].has_datetime) {
       wippersnapper_gps_GPSDateTime gps_dt =
@@ -1376,14 +1376,15 @@ bool ws_sdcard::LogEventGps(wippersnapper_gps_GPSEvent *msg_gps_event) {
     doc["lon_dir"] = msg_gps_event->rmc_responses[rmc_resp].lon_dir;
     doc["speed"] = msg_gps_event->rmc_responses[rmc_resp].speed;
     doc["angle"] = msg_gps_event->rmc_responses[rmc_resp].angle;
-    if (!LogJSONDoc(doc))
+    if (!LogJSONDoc(doc)) {
+      WS_DEBUG_PRINTLN("[SD] Error: Unable to log RMC response!");
       return false;
+    }
   }
 
   // Log GGA responses
   for (pb_size_t gga_resp = 0; gga_resp < msg_gps_event->gga_responses_count;
        gga_resp++) {
-    WS_DEBUG_PRINTLN("[SD] Logging GGA response...");
     // Log GPS DateTime
     if (msg_gps_event->gga_responses[gga_resp].has_datetime) {
       wippersnapper_gps_GPSDateTime gps_dt =
@@ -1403,8 +1404,10 @@ bool ws_sdcard::LogEventGps(wippersnapper_gps_GPSEvent *msg_gps_event) {
     doc["hdop"] = msg_gps_event->gga_responses[gga_resp].hdop;
     doc["altitude"] = msg_gps_event->gga_responses[gga_resp].altitude;
     doc["geoid_height"] = msg_gps_event->gga_responses[gga_resp].geoid_height;
-    if (!LogJSONDoc(doc))
+    if (!LogJSONDoc(doc)) {
+      WS_DEBUG_PRINTLN("[SD] Error: Unable to log GGA response!");
       return false;
+    }
   }
 
   return true;