From f78db641192b31a3453591ae6a56a29c3a0d77e8 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 2 Dec 2015 15:51:43 -0600 Subject: update success and failure layouts and modes to display GPS data when available --- Layout/LayoutSurveyFailure.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'Layout/LayoutSurveyFailure.h') 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; }; -- cgit v1.2.3