GPS - store 1 GGA/RMC event within model FIFO

Author: brentru

src/components/gps/controller.cpp

@@ -234,7 +234,6 @@ void GPSController::update() {
       WS_DEBUG_PRINT("[gps] Parsing NMEA sentence: ");
       WS_DEBUG_PRINTLN(nmea_sentence);
       if (!ada_gps->parse(nmea_sentence)) {
-        WS_DEBUG_PRINTLN("[gps] Failed to parse NMEA sentence!"); // TODO: Remove in Prod!
         continue; // Skip parsing this sentence if parsing failed
       }
       has_gps_event = true;
@@ -244,13 +243,11 @@ void GPSController::update() {
           ada_gps->milliseconds, ada_gps->day, ada_gps->month, ada_gps->year);
       if (strncmp(nmea_sentence, "$GPRMC", 6) == 0 ||
           strncmp(nmea_sentence, "$GNRMC", 6) == 0) {
-        WS_DEBUG_PRINTLN("[gps] Processing RMC sentence"); // TODO: Remove in Prod!
         _gps_model->AddGpsEventRMC(
             datetime, ada_gps->fix, ada_gps->latitude, &ada_gps->lat,
             ada_gps->longitude, &ada_gps->lon, ada_gps->speed, ada_gps->angle);
       } else if (strncmp(nmea_sentence, "$GPGGA", 6) == 0 ||
                  strncmp(nmea_sentence, "$GNGGA", 6) == 0) {
-        WS_DEBUG_PRINTLN("[gps] Processing GGA sentence"); // TODO: Remove in Prod!
         _gps_model->AddGpsEventGGA(
             datetime, ada_gps->fix, ada_gps->latitude, &ada_gps->lat,
             ada_gps->longitude, &ada_gps->lon, ada_gps->satellites,
@@ -264,7 +261,9 @@ void GPSController::update() {
     // We did not create a GPSEvent because the NMEA sentences were not
     // GGA/RMC or parsed correctly
     if (!has_gps_event) {
-      WS_DEBUG_PRINTLN("[gps] No GPSEvent created from NMEA sentences!");
+      WS_DEBUG_PRINTLN(
+          "[gps] No GPSEvent created from NMEA sentences!"); // TODO: Remove
+                                                             // this in prod
       continue;
     }
 
@@ -279,7 +278,7 @@ void GPSController::update() {
                               _gps_model->GetGPSEvent())) {
         WS_DEBUG_PRINTLN("[gps] ERROR: Failed to publish GPSEvent!");
       } else {
-        WS_DEBUG_PRINTLN("[gps] GPSEvent published successfully!");
+        WS_DEBUG_PRINTLN("...ok!");
       }
     }
     drv->SetPollPeriodPrv(cur_time);

src/components/gps/model.cpp

@@ -118,14 +118,11 @@ bool GPSModel::AddGpsEventRMC(wippersnapper_gps_GPSDateTime datetime,
                               uint8_t fix_status, float lat, char *lat_dir,
                               float lon, char *lon_dir, float speed,
                               float angle) {
-  // Check if we've reached the maximum number of RMC responses
-  if (_msg_gps_event.rmc_responses_count >= MAX_COUNT_RMC_GGA)
-    return false;
-
   // Validate pointers have been provided correctly
   if (!lat_dir || !lon_dir)
     return false;
 
+  // Always store at index 0, overwriting any previous response
   wippersnapper_gps_GPSRMCResponse rmc_response;
   rmc_response = wippersnapper_gps_GPSRMCResponse_init_zero;
   rmc_response.has_datetime = true;
@@ -152,21 +149,16 @@ bool GPSModel::AddGpsEventRMC(wippersnapper_gps_GPSDateTime datetime,
   // Fill course in degrees from true north
   snprintf(rmc_response.angle, sizeof(rmc_response.angle), "%.1f", angle);
 
-  _msg_gps_event.rmc_responses[_msg_gps_event.rmc_responses_count] =
-      rmc_response;
-  _msg_gps_event.rmc_responses_count++;
+  // Always store at index 0, overwrite any previous response in the FIFO buffer
+  _msg_gps_event.rmc_responses[0] = rmc_response;
+  _msg_gps_event.rmc_responses_count = 1;
   return true;
 }
 
 bool GPSModel::AddGpsEventGGA(wippersnapper_gps_GPSDateTime datetime,
                               uint8_t fix_status, float lat, char *lat_dir,
                               float lon, char *lon_dir, uint8_t num_sats,
                               float hdop, float alt, float geoid_height) {
-
-  // Check if we've reached the maximum number of RMC responses
-  if (_msg_gps_event.gga_responses_count >= MAX_COUNT_RMC_GGA)
-    return false;
-
   // Validate pointers have been provided correctly
   if (!lat_dir || !lon_dir)
     return false;
@@ -197,8 +189,8 @@ bool GPSModel::AddGpsEventGGA(wippersnapper_gps_GPSDateTime datetime,
   snprintf(gga_response.geoid_height, sizeof(gga_response.geoid_height), "%.1f",
            geoid_height);
 
-  _msg_gps_event.gga_responses[_msg_gps_event.gga_responses_count] =
-      gga_response;
-  _msg_gps_event.gga_responses_count++;
+  // Always store at index 0, overwrite any previous response in the FIFO buffer
+  _msg_gps_event.gga_responses[0] = gga_response;
+  _msg_gps_event.gga_responses_count = 1;
   return true;
 }