update success and failure layouts and modes to display GPS data when available

7 files changed, 156 insertions, 43 deletions

diff --git a/Layout/LayoutSurveyFailure.cpp b/Layout/LayoutSurveyFailure.cpp
index aa2ce7c..4b313af 100644
--- a/Layout/LayoutSurveyFailure.cpp
+++ b/Layout/LayoutSurveyFailure.cpp
@@ -9,10 +9,10 @@ LayoutSurveyFailure::LayoutSurveyFailure(DOGS102* lcd)
     _fId(2, 0, 5),
     _fDr(10, 0, 2),
     _fPwr(14, 0, 2),
-    _fMsg1(0, 2, 17),
-    _fMsg2(0, 3, 17),
-    _fInfo1(0, 5, 17),
-    _fInfo2(0, 6, 17),
+    _fGpsLat(0, 4, 17),
+    _fGpsLon(0, 3, 17),
+    _fGpsTime(0, 5, 17),
+    _fInfo(0, 6, 17),
     _fSw1(9, 7, 8),
     _fSw2(0, 7, 8)
 {}
@@ -51,21 +51,54 @@ void LayoutSurveyFailure::updatePower(uint32_t power) {
     writeField(_fPwr, buf, size, true);
 }
 
-void LayoutSurveyFailure::updateInfo1(std::string info) {
-    writeField(_fInfo1, info, true);
+void LayoutSurveyFailure::updateGpsLatitude(GPSPARSER::latitude lat) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+        abs(lat.degrees),
+        lat.minutes,
+        (lat.seconds * 6) / 1000,
+        (lat.seconds * 6) % 1000,
+        (lat.degrees > 0) ? 'N' : 'S');
+    writeField(_fGpsLat, buf, size, true);
 }
 
-void LayoutSurveyFailure::updateInfo2(std::string info) {
-    writeField(_fInfo2, info, true);
+void LayoutSurveyFailure::updateGpsLatitude(std::string msg) {
+    writeField(_fGpsLat, msg, true);
 }
 
-void LayoutSurveyFailure::updatePassFail(uint8_t pass, uint8_t fail) {
+void LayoutSurveyFailure::updateGpsLongitude(GPSPARSER::longitude lon) {
     char buf[32];
     size_t size;
 
     memset(buf, 0, sizeof(buf));
-    size = snprintf(buf, sizeof(buf), "Pass %u Fail %u", pass, fail);
-    writeField(_fInfo1, buf, size, true);
+    size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+        abs(lon.degrees),
+        lon.minutes,
+        (lon.seconds * 6) / 1000,
+        (lon.seconds * 6) % 1000,
+        (lon.degrees > 0) ? 'E' : 'W');
+    writeField(_fGpsLon, buf, size, true);
+}
+
+void LayoutSurveyFailure::updateGpsTime(struct tm time) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%02d:%02d %02d/%02d/%04d",
+        time.tm_hour,
+        time.tm_min,
+        time.tm_mon + 1,
+        time.tm_mday,
+        time.tm_year + 1900);
+    writeField(_fGpsTime, buf, size, true);
+}
+
+void LayoutSurveyFailure::updateInfo(std::string info) {
+    writeField(_fInfo, info, true);
 }
 
 void LayoutSurveyFailure::updateSw1(std::string sw1) {
@@ -76,3 +109,12 @@ void LayoutSurveyFailure::updateSw2(std::string sw2) {
     writeField(_fSw2, sw2, true);
 }
 
+void LayoutSurveyFailure::updatePassFail(uint8_t pass, uint8_t fail) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "Pass %u Fail %u", pass, fail);
+    writeField(_fGpsTime, buf, size, true);
+}
+
diff --git a/Layout/LayoutSurveyFailure.h b/Layout/LayoutSurveyFailure.h
index ca6aebd..aac3142 100644
--- a/Layout/LayoutSurveyFailure.h
+++ b/Layout/LayoutSurveyFailure.h
@@ -2,6 +2,7 @@
 #define __LAYOUTSURVEYFAILURE_H__
 
 #include "Layout.h"
+#include "GPSPARSER.h"
 
 class LayoutSurveyFailure : public Layout {
     public:
@@ -12,11 +13,14 @@ class LayoutSurveyFailure : public Layout {
         void updateId(uint32_t id);
         void updateRate(std::string rate);
         void updatePower(uint32_t power);
-        void updateInfo1(std::string msg);
-        void updateInfo2(std::string msg);
-        void updatePassFail(uint8_t pass, uint8_t fail);
+        void updateGpsLatitude(GPSPARSER::latitude lat);
+        void updateGpsLatitude(std::string msg);
+        void updateGpsLongitude(GPSPARSER::longitude lon);
+        void updateGpsTime(struct tm time);
+        void updateInfo(std::string info);
         void updateSw1(std::string sw1);
         void updateSw2(std::string sw2);
+        void updatePassFail(uint8_t pass, uint8_t fail);
 
     private:
         Label _lTitle;
@@ -27,10 +31,10 @@ class LayoutSurveyFailure : public Layout {
         Field _fId;
         Field _fDr;
         Field _fPwr;
-        Field _fMsg1;
-        Field _fMsg2;
-        Field _fInfo1;
-        Field _fInfo2;
+        Field _fGpsLat;
+        Field _fGpsLon;
+        Field _fGpsTime;
+        Field _fInfo;
         Field _fSw1;
         Field _fSw2;
 };
diff --git a/Layout/LayoutSurveySuccess.cpp b/Layout/LayoutSurveySuccess.cpp
index 38edb5c..01a0c94 100644
--- a/Layout/LayoutSurveySuccess.cpp
+++ b/Layout/LayoutSurveySuccess.cpp
@@ -83,6 +83,17 @@ void LayoutSurveySuccess::updateStats(LoRaHandler::LoRaPing ping) {
 }
 
 void LayoutSurveySuccess::updateGpsLatitude(GPSPARSER::latitude lat) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+        abs(lat.degrees),
+        lat.minutes,
+        (lat.seconds * 6) / 1000,
+        (lat.seconds * 6) % 1000,
+        (lat.degrees > 0) ? 'N' : 'S');
+    writeField(_fGpsLat, buf, size, true);
 }
 
 void LayoutSurveySuccess::updateGpsLatitude(std::string msg) {
@@ -90,9 +101,31 @@ void LayoutSurveySuccess::updateGpsLatitude(std::string msg) {
 }
 
 void LayoutSurveySuccess::updateGpsLongitude(GPSPARSER::longitude lon) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%d %d %d.%03d %c",
+        abs(lon.degrees),
+        lon.minutes,
+        (lon.seconds * 6) / 1000,
+        (lon.seconds * 6) % 1000,
+        (lon.degrees > 0) ? 'E' : 'W');
+    writeField(_fGpsLon, buf, size, true);
 }
 
 void LayoutSurveySuccess::updateGpsTime(struct tm time) {
+    char buf[32];
+    size_t size;
+
+    memset(buf, 0, sizeof(buf));
+    size = snprintf(buf, sizeof(buf), "%02d:%02d %02d/%02d/%04d",
+        time.tm_hour,
+        time.tm_min,
+        time.tm_mon + 1,
+        time.tm_mday,
+        time.tm_year + 1900);
+    writeField(_fGpsTime, buf, size, true);
 }
 
 void LayoutSurveySuccess::updateInfo(std::string info) {
diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp
index c44b3bd..68a1d0e 100644
--- a/Mode/Mode.cpp
+++ b/Mode/Mode.cpp
@@ -26,7 +26,8 @@ Mode::Mode(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora, G
     _data_rate(mDot::SF_7),
     _power(2),
     _next_tx(0),
-    _send_data(false)
+    _send_data(false),
+    _gps_available(_gps->gpsDetected())
 {}
 
 Mode::~Mode() {}
@@ -68,18 +69,18 @@ bool Mode::appendDataFile(const DataItem& data) {
     snprintf(id_buf, sizeof(id_buf), "%c%ld", (data.type == single) ? 'P' : 'S', data.index);
 
     // if we had GPS lock, format GPS data
-    if (data.lock > 0) {
-        snprintf(lat_buf, sizeof(lat_buf), "%3d %2d %2d.%03d %c",
+    if (data.gps_lock) {
+        snprintf(lat_buf, sizeof(lat_buf), "%d %d %d.%03d %c",
             abs(data.gps_latitude.degrees),
             data.gps_latitude.minutes,
             (data.gps_latitude.seconds * 6) / 1000,
-            (data.gps_latitude.seconds % 6) / 1000,
+            (data.gps_latitude.seconds * 6) % 1000,
             (data.gps_latitude.degrees > 0) ? 'N' : 'S');
-        snprintf(lon_buf, sizeof(lon_buf), "%3d %2d %2d.%03d %c",
+        snprintf(lon_buf, sizeof(lon_buf), "%d %d %d.%03d %c",
             abs(data.gps_longitude.degrees),
             data.gps_longitude.minutes,
             (data.gps_longitude.seconds * 6) / 1000,
-            (data.gps_longitude.seconds % 6) / 1000,
+            (data.gps_longitude.seconds * 6) % 1000,
             (data.gps_longitude.degrees > 0) ? 'E' : 'W');
         snprintf(alt_buf, sizeof(alt_buf), "%d",
             data.gps_altitude);
@@ -95,7 +96,7 @@ bool Mode::appendDataFile(const DataItem& data) {
     if (data.status) {
         float up_snr = (float)data.ping.up.snr / 10.0;
         float down_snr = (float)data.ping.down.snr / 4.0;
-        snprintf(stats_buf, sizeof(stats_buf), "%3d,%2.1f,%3d,%2.1f",
+        snprintf(stats_buf, sizeof(stats_buf), "%d,%2.1f,%d,%2.1f",
             abs(data.ping.up.rssi),
             up_snr,
             abs(data.ping.down.rssi),
@@ -105,11 +106,11 @@ bool Mode::appendDataFile(const DataItem& data) {
     size = snprintf(main_buf, sizeof(main_buf), "%s,%c,%ld,%s,%s,%s,%s,%s,%s,%lu\n",
         id_buf,
         data.status ? 'S' : 'F',
-        data.lock,
-        (data.lock > 0) ? lat_buf : "",
-        (data.lock > 0) ? lon_buf : "",
-        (data.lock > 0) ? alt_buf : "",
-        (data.lock > 0) ? time_buf : "",
+        data.gps_lock ? data.gps_sats : 0,
+        (data.gps_lock) ? lat_buf : "",
+        (data.gps_lock) ? lon_buf : "",
+        (data.gps_lock) ? alt_buf : "",
+        (data.gps_lock) ? time_buf : "",
         data.status ? stats_buf : ",,,",
         _dot->DataRateStr(data.data_rate).substr(3).c_str(),
         data.power);
@@ -133,10 +134,12 @@ void Mode::updateData(DataItem& data, DataType type, bool status) {
     data.type = type;
     data.index = _index;
     data.status = status;
-    data.lock = 0;
+    data.gps_lock = _gps->getLockStatus();
+    data.gps_sats = _gps->getNumSatellites();
     data.gps_longitude = _gps->getLongitude();
     data.gps_latitude = _gps->getLatitude();
     data.gps_altitude = _gps->getAltitude();
+    data.gps_time = _gps->getTimestamp();
     data.ping = _ping_result;
     data.data_rate = _data_rate;
     data.power = _power;
diff --git a/Mode/Mode.h b/Mode/Mode.h
index f427eea..ce4890f 100644
--- a/Mode/Mode.h
+++ b/Mode/Mode.h
@@ -21,7 +21,8 @@ class Mode {
             DataType type;
             int32_t index;
             bool status;
-            int32_t lock;
+	    bool gps_lock;
+            int32_t gps_sats;
             GPSPARSER::longitude gps_longitude;
             GPSPARSER::latitude gps_latitude;
             int16_t gps_altitude;
@@ -70,6 +71,7 @@ class Mode {
         LoRaHandler::LoRaPing _ping_result;
         uint8_t _state;
         bool _send_data;
+	bool _gps_available;
 };
 
 #endif
diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp
index 49119a0..42198e7 100644
--- a/Mode/ModeSingle.cpp
+++ b/Mode/ModeSingle.cpp
@@ -80,7 +80,7 @@ bool ModeSingle::start() {
                                 break;
                             case failure:
                                 incrementRatePower();
-                                _failure.updateInfo2(formatNewRatePower());
+                                _failure.updateInfo(formatNewRatePower());
                                 logInfo("new data rate %u, power %lu", _data_rate, _power);
                                 break;
                         }
@@ -189,6 +189,16 @@ bool ModeSingle::start() {
                                 updateData(_data, single, false);
                                 appendDataFile(_data);
                                 _failure.updatePower(_power);
+                                if (_gps_available && _gps->getLockStatus()) {
+                                    GPSPARSER::latitude lat = _gps->getLatitude();
+                                    GPSPARSER::longitude lon = _gps->getLongitude();
+                                    struct tm time = _gps->getTimestamp();
+                                    _failure.updateGpsLatitude(lat);
+                                    _failure.updateGpsLongitude(lon);
+                                    _failure.updateGpsTime(time);
+                                } else {
+                                    _failure.updateGpsLatitude("No GPS Lock");
+                                }
                                 _failure.updateSw1("   Power");
                                 _failure.updateSw2("Survey");
                                 logInfo("ping failed");
@@ -303,17 +313,25 @@ void ModeSingle::displayHelp() {
 }
 
 void ModeSingle::displaySuccess() {
+    logInfo("gps lock: %s", _gps->getLockStatus() ? "true" : "false");
+    uint8_t fix = _gps->getFixStatus();
+    logInfo("gps fix: %s", fix == 3 ? "3D" : fix == 2 ? "2D" : "none");
     _success.display();
     _success.updateId(_index);
     // mDot::DataRateStr returns format SF_XX - we only want to display the XX part
     _success.updateRate(_dot->DataRateStr(_data_rate).substr(3));
     _success.updatePower(_power);
     _success.updateStats(_ping_result);
-    // if GPS lock
-    // display GPS latitude, longitude, and time
-    // else
-    // display "no lock"
-    _success.updateGpsLatitude("No GPS Lock");
+    if (_gps_available && _gps->getLockStatus()) {
+        GPSPARSER::latitude lat = _gps->getLatitude();
+        GPSPARSER::longitude lon = _gps->getLongitude();
+        struct tm time = _gps->getTimestamp();
+        _success.updateGpsLatitude(lat);
+        _success.updateGpsLongitude(lon);
+        _success.updateGpsTime(time);
+    } else {
+        _success.updateGpsLatitude("No GPS Lock");
+    }
 }
 
 std::string ModeSingle::formatNewRatePower() {
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp
index 8d22622..7ede74d 100644
--- a/Mode/ModeSweep.cpp
+++ b/Mode/ModeSweep.cpp
@@ -227,6 +227,14 @@ bool ModeSweep::start() {
                                 // mDot::DataRateStr returns format SF_XX - we only want to display the XX part
                                 _failure.updateRate(_dot->DataRateStr(_data_rate).substr(3));
                                 _failure.updatePower(_power);
+                                if (_gps_available && _gps->getLockStatus()) {
+                                    GPSPARSER::latitude lat = _gps->getLatitude();
+                                    GPSPARSER::longitude lon = _gps->getLongitude();
+                                    _failure.updateGpsLatitude(lat);
+                                    _failure.updateGpsLongitude(lon);
+                                } else {
+                                    _failure.updateGpsLatitude("No GPS Lock");
+                                }
                                 _failure.updatePassFail(_survey_success, _survey_failure);
                                 _failure.updateSw1("  Cancel");
                                 updateData(_data, sweep, false);
@@ -381,11 +389,14 @@ void ModeSweep::displaySuccess() {
     _success.updateRate(_dot->DataRateStr(_data_rate).substr(3));
     _success.updatePower(_power);
     _success.updateStats(_ping_result);
-    // if GPS lock
-    // display GPS latitude, longitude, and time
-    // else
-    // display "no lock"
-    _success.updateGpsLatitude("No GPS Lock");
+    if (_gps_available && _gps->getLockStatus()) {
+        GPSPARSER::latitude lat = _gps->getLatitude();
+        GPSPARSER::longitude lon = _gps->getLongitude();
+        _success.updateGpsLatitude(lat);
+        _success.updateGpsLongitude(lon);
+    } else {
+        _success.updateGpsLatitude("No GPS Lock");
+    }
     _success.updatePassFail(_survey_success, _survey_failure);
 }