GPS - Add Parsing to SD Card

Author: brentru

src/components/gps/controller.cpp

@@ -72,7 +72,8 @@ bool GPSController::AddGPS(TwoWire *wire, uint32_t i2c_addr,
  * @param gps_config Pointer to the GPS configuration message.
  * @return True if the GPS was added successfully, false otherwise.
  */
-bool GPSController::AddGPS(HardwareSerial *serial, uint32_t baudrate, wippersnapper_gps_GPSConfig *gps_config) {
+bool GPSController::AddGPS(HardwareSerial *serial, uint32_t baudrate,
+                           wippersnapper_gps_GPSConfig *gps_config) {
   GPSHardware *gps_hw = new GPSHardware();
 
   if (!gps_hw->SetInterface(serial, baudrate)) {
@@ -156,17 +157,29 @@ void GPSController::update() {
       // Encode and publish to IO
       WS_DEBUG_PRINT("[gps] Encoding and publishing GPSEvent to IO...");
       bool did_encode = _gps_model->EncodeGPSEvent();
-      if (!did_encode) {
-        WS_DEBUG_PRINTLN("[gps] ERROR: Failed to encode GPSEvent!");
-      } else {
-        // Publish the GPSEvent to IO
-        if (!WsV2.PublishSignal(
-                wippersnapper_signal_DeviceToBroker_gps_event_tag,
-                _gps_model->GetGPSEvent())) {
-          WS_DEBUG_PRINTLN("[gps] ERROR: Failed to publish GPSEvent!");
+      if (did_encode) {
+
+        if (!WsV2._sdCardV2->isModeOffline()) {
+          // Publish the GPSEvent to IO
+          if (!WsV2.PublishSignal(
+                  wippersnapper_signal_DeviceToBroker_gps_event_tag,
+                  _gps_model->GetGPSEvent())) {
+            WS_DEBUG_PRINTLN("[gps] ERROR: Failed to publish GPSEvent!");
+          } else {
+            WS_DEBUG_PRINTLN("...ok!");
+          }
         } else {
-          WS_DEBUG_PRINTLN("...ok!");
+          // Log the GPSEvent to SD card
+          WS_DEBUG_PRINT("[gps] Logging GPSEvent to SD card...");
+/*           if (!WsV2._sdCardV2->LogGPSEventToSD(_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!");
+          } */
         }
+      } else {
+        WS_DEBUG_PRINTLN("[gps] ERROR: Failed to encode GPSEvent!");
       }
       drv->SetPollPeriodPrv(cur_time);
     }

src/provisioning/sdcard/ws_sdcard.cpp

@@ -14,15 +14,13 @@
  */
 #include "ws_sdcard.h"
 
-/**************************************************************************/
 /*!
     @brief    Initializes the SD card.
     @param    pin_cs
               The chip select pin for the SD card.
     @returns  True if the SD card was successfully initialized, False
               otherwise.
 */
-/**************************************************************************/
 bool ws_sdcard::InitSdCard(uint8_t pin_cs) {
   WsV2.pin_sd_cs = pin_cs;
 #ifdef SD_USE_SPI_1
@@ -1310,14 +1308,12 @@ bool ws_sdcard::LogDS18xSensorEventToSD(
   return true;
 }
 
-/**************************************************************************/
 /*!
     @brief  Logs an I2C sensor event to the SD card.
     @param  msg_device_event
             The I2cDeviceEvent message to log.
     @returns True if the event was successfully logged, False otherwise.
 */
-/**************************************************************************/
 bool ws_sdcard::LogI2cDeviceEvent(
     wippersnapper_i2c_I2cDeviceEvent *msg_device_event) {
   JsonDocument doc;
@@ -1347,14 +1343,70 @@ bool ws_sdcard::LogI2cDeviceEvent(
   return true;
 }
 
+/*!
+    @brief  Logs a GPS event to the SD card.
+    @param  msg_gps_event
+            The GPSEvent message to log.
+    @returns True if the event was successfully logged, False otherwise.
+*/
+bool ws_sdcard::LogGPSEventToSD(wippersnapper_gps_GPSEvent *msg_gps_event) {
+    JsonDocument doc;
+
+    // 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 = msg_gps_event->rmc_responses[rmc_resp].datetime;
+            DateTime gps_datetime(gps_dt.year, gps_dt.month, gps_dt.day, 
+                                  gps_dt.hour, gps_dt.minute, gps_dt.seconds);
+            doc["timestamp"] = gps_datetime.unixtime();
+        }
+        // Log GPS data
+        doc["fix_status"] = msg_gps_event->rmc_responses[rmc_resp].fix_status;
+        doc["latitude"] = msg_gps_event->rmc_responses[rmc_resp].lat;
+        doc["lat_dir"] = msg_gps_event->rmc_responses[rmc_resp].lat_dir;
+        doc["longitude"] = msg_gps_event->rmc_responses[rmc_resp].lon;
+        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))
+            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 = msg_gps_event->gga_responses[gga_resp].datetime;
+            DateTime gps_datetime(gps_dt.year, gps_dt.month, gps_dt.day, 
+                                  gps_dt.hour, gps_dt.minute, gps_dt.seconds);
+            doc["timestamp"] = gps_datetime.unixtime();
+        }
+        // Log GPS data
+        doc["latitude"] = msg_gps_event->gga_responses[gga_resp].lat;
+        doc["lat_dir"] = msg_gps_event->gga_responses[gga_resp].lat_dir;
+        doc["longitude"] = msg_gps_event->gga_responses[gga_resp].lon;
+        doc["lon_dir"] = msg_gps_event->gga_responses[gga_resp].lon_dir;
+        doc["fix_quality"] = msg_gps_event->gga_responses[gga_resp].fix_quality;
+        doc["num_satellites"] = msg_gps_event->gga_responses[gga_resp].num_satellites;
+        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))
+            return false;
+    }
+
+    return true;
+}
+
 #ifdef OFFLINE_MODE_DEBUG
-/**************************************************************************/
 /*!
     @brief  Waits for a valid JSON string to be received via the hardware's
             serial input or from a hardcoded test JSON string.
     @returns True if a valid JSON string was received, False otherwise.
 */
-/**************************************************************************/
 void ws_sdcard::waitForSerialConfig() {
   json_test_data = "{"
                    "\"exportVersion\": \"1.0.0\","

src/provisioning/sdcard/ws_sdcard.h

@@ -70,7 +70,7 @@ class ws_sdcard {
                               wippersnapper_sensor_SensorType read_type);
   bool LogDS18xSensorEventToSD(wippersnapper_ds18x20_Ds18x20Event *event_msg);
   bool LogI2cDeviceEvent(wippersnapper_i2c_I2cDeviceEvent *msg_device_event);
-
+  bool LogGPSEventToSD(wippersnapper_gps_GPSEvent *msg_gps_event);
 private:
   bool ParseExportedFromDevice(JsonDocument &doc);
   void ConfigureSDCard();

src/provisioning/tinyusb/Wippersnapper_FS.h

@@ -18,9 +18,9 @@
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 #include "SdFat_Adafruit_Fork.h"
+#include "fatfs/ff.h" // NOTE: This should be #included before fatfs/diskio.h!!!
 // using f_mkfs() for formatting
 #include "fatfs/diskio.h"
-#include "fatfs/ff.h" // NOTE: This should be #included before fatfs/diskio.h!!!
 
 #include "Wippersnapper_V2.h"