update progress and pass/fail for sweep

1 files changed, 30 insertions, 10 deletions

diff --git a/Layout/LayoutSurveyFailure.cpp b/Layout/LayoutSurveyFailure.cpp
index d443098..aa2ce7c 100644
--- a/Layout/LayoutSurveyFailure.cpp
+++ b/Layout/LayoutSurveyFailure.cpp
@@ -2,18 +2,19 @@
 
 LayoutSurveyFailure::LayoutSurveyFailure(DOGS102* lcd)
   : Layout(lcd),
-    _lTitle(0, 2, "Survey Failed"),
+    _lTitle(0, 1, "Survey Failed"),
     _lId(0, 0, "ID"),
     _lDr(8, 0, "DR"),
     _lPwr(13, 0, "P"),
-    _lSw1(12, 7, "Power"),
-    _lSw2(0, 7, "Survey"),
     _fId(2, 0, 5),
     _fDr(10, 0, 2),
     _fPwr(14, 0, 2),
-    _fMsg1(0, 4, 17),
-    _fMsg2(0, 5, 17),
-    _fInfo(0, 6, 17)
+    _fMsg1(0, 2, 17),
+    _fMsg2(0, 3, 17),
+    _fInfo1(0, 5, 17),
+    _fInfo2(0, 6, 17),
+    _fSw1(9, 7, 8),
+    _fSw2(0, 7, 8)
 {}
 
 LayoutSurveyFailure::~LayoutSurveyFailure() {}
@@ -26,8 +27,6 @@ void LayoutSurveyFailure::display() {
     writeLabel(_lId);
     writeLabel(_lDr);
     writeLabel(_lPwr);
-    writeLabel(_lSw1);
-    writeLabel(_lSw2);
 
     endUpdate();
 }
@@ -52,7 +51,28 @@ void LayoutSurveyFailure::updatePower(uint32_t power) {
     writeField(_fPwr, buf, size, true);
 }
 
-void LayoutSurveyFailure::updateInfo(std::string info) {
-    writeField(_fInfo, info, true);
+void LayoutSurveyFailure::updateInfo1(std::string info) {
+    writeField(_fInfo1, info, true);
+}
+
+void LayoutSurveyFailure::updateInfo2(std::string info) {
+    writeField(_fInfo2, info, 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(_fInfo1, buf, size, true);
+}
+
+void LayoutSurveyFailure::updateSw1(std::string sw1) {
+    writeField(_fSw1, sw1, true);
+}
+
+void LayoutSurveyFailure::updateSw2(std::string sw2) {
+    writeField(_fSw2, sw2, true);
 }