diff options
author | Mike Fiore <mfiore@multitech.com> | 2015-12-11 09:47:25 -0600 |
---|---|---|
committer | Mike Fiore <mfiore@multitech.com> | 2015-12-11 09:47:25 -0600 |
commit | 2780dbb79e01d916e48452abf7d0e2b1b85dc643 (patch) | |
tree | bc9a4d964d8be761e7ded4b47257d538561e12ea /Layout/LayoutJoin.cpp | |
parent | 8f3d5d0a8e9539ebcc203f5dd7c3661cad101a35 (diff) | |
download | mtdot-box-evb-factory-firmware-2780dbb79e01d916e48452abf7d0e2b1b85dc643.tar.gz mtdot-box-evb-factory-firmware-2780dbb79e01d916e48452abf7d0e2b1b85dc643.tar.bz2 mtdot-box-evb-factory-firmware-2780dbb79e01d916e48452abf7d0e2b1b85dc643.zip |
fix bug in layout where a character from last field could be displayed in new field, remove lots of memset calls
Diffstat (limited to 'Layout/LayoutJoin.cpp')
-rw-r--r-- | Layout/LayoutJoin.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Layout/LayoutJoin.cpp b/Layout/LayoutJoin.cpp index fea558e..487f04b 100644 --- a/Layout/LayoutJoin.cpp +++ b/Layout/LayoutJoin.cpp @@ -53,7 +53,6 @@ void LayoutJoin::updateFsb(uint8_t band) { char buf[8]; size_t size; - memset(buf, 0, sizeof(buf)); size = snprintf(buf, sizeof(buf), "%u", band); writeField(_fFsb, buf, size, true); } @@ -66,7 +65,6 @@ void LayoutJoin::updatePower(uint32_t power) { char buf[16]; size_t size; - memset(buf, 0, sizeof(buf)); size = snprintf(buf, sizeof(buf), "%lu", power); writeField(_fPower, buf, size, true); } @@ -75,7 +73,6 @@ void LayoutJoin::updateAttempt(uint32_t attempt) { char buf[16]; size_t size; - memset(buf, 0, sizeof(buf)); size = snprintf(buf, sizeof(buf), "%lu", attempt); writeField(_fAttempt, buf, size, true); } @@ -88,18 +85,18 @@ void LayoutJoin::updateCountdown(uint32_t seconds) { char buf[16]; size_t size; - memset(buf, 0, sizeof(buf)); - // for some reason, there's a % character that gets displayed in the last column - // add the extra spaces to wipe it out - writeField(_fCountdownLabel, "No Free Channel ", true); + writeField(_fCountdownLabel, "No Free Channel", true); size = snprintf(buf, sizeof(buf), "%lu s", seconds); writeField(_fCountdown, buf, size, true); } void LayoutJoin::displayCancel(bool display) { + std::string str; if (display) - writeField(_fCancel, "Cancel", true); + str = "Cancel"; else - removeField(_fCancel); + str = string(17, ' '); + + writeField(_fCancel, str, true); } |