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

3 files changed, 97 insertions, 18 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) {