summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2015-12-11 10:14:56 -0600
committerMike Fiore <mfiore@multitech.com>2015-12-11 10:14:56 -0600
commita1bb849d38853c79285665e702f9425770e74133 (patch)
treea89e2e57a70c87ddf0e945ebe0d6a3a3301d921f
parent2780dbb79e01d916e48452abf7d0e2b1b85dc643 (diff)
downloadmtdot-box-evb-factory-firmware-a1bb849d38853c79285665e702f9425770e74133.tar.gz
mtdot-box-evb-factory-firmware-a1bb849d38853c79285665e702f9425770e74133.tar.bz2
mtdot-box-evb-factory-firmware-a1bb849d38853c79285665e702f9425770e74133.zip
display "No Free Channel" string properly in 868 mode
-rw-r--r--Layout/LayoutDemoSampling.cpp3
-rw-r--r--Layout/LayoutJoin.cpp3
-rw-r--r--Layout/LayoutSurveyProgress.cpp3
-rw-r--r--Layout/LayoutSurveySuccess.cpp3
-rw-r--r--Layout/LayoutSweepProgress.cpp3
5 files changed, 10 insertions, 5 deletions
diff --git a/Layout/LayoutDemoSampling.cpp b/Layout/LayoutDemoSampling.cpp
index 1d1c92b..990e1e4 100644
--- a/Layout/LayoutDemoSampling.cpp
+++ b/Layout/LayoutDemoSampling.cpp
@@ -54,7 +54,8 @@ void LayoutDemoSampling::updateCountdown(uint32_t seconds) {
char buf[32];
size_t size;
- writeField(_fInfo, "No Free Channel", true);
+ // make sure the string version is used
+ writeField(_fInfo, string("No Free Channel"), true);
size = snprintf(buf, sizeof(buf), "%lu s", seconds);
writeField(_fSw2, buf, size, true);
}
diff --git a/Layout/LayoutJoin.cpp b/Layout/LayoutJoin.cpp
index 487f04b..6d58b57 100644
--- a/Layout/LayoutJoin.cpp
+++ b/Layout/LayoutJoin.cpp
@@ -85,7 +85,8 @@ void LayoutJoin::updateCountdown(uint32_t seconds) {
char buf[16];
size_t size;
- writeField(_fCountdownLabel, "No Free Channel", true);
+ // make sure the string version is used
+ writeField(_fCountdownLabel, string("No Free Channel"), true);
size = snprintf(buf, sizeof(buf), "%lu s", seconds);
writeField(_fCountdown, buf, size, true);
}
diff --git a/Layout/LayoutSurveyProgress.cpp b/Layout/LayoutSurveyProgress.cpp
index 42f238b..b3d6338 100644
--- a/Layout/LayoutSurveyProgress.cpp
+++ b/Layout/LayoutSurveyProgress.cpp
@@ -26,7 +26,8 @@ void LayoutSurveyProgress::updateCountdown(uint32_t seconds) {
char buf[16];
size_t size;
- writeField(_fCountdownLabel, "No Free Channel", true);
+ // make sure the string version is used
+ writeField(_fCountdownLabel, string("No Free Channel"), true);
size = snprintf(buf, sizeof(buf), "%lu s", seconds);
writeField(_fCountdown, buf, size, true);
}
diff --git a/Layout/LayoutSurveySuccess.cpp b/Layout/LayoutSurveySuccess.cpp
index 6d0fa27..be86b79 100644
--- a/Layout/LayoutSurveySuccess.cpp
+++ b/Layout/LayoutSurveySuccess.cpp
@@ -141,7 +141,8 @@ void LayoutSurveySuccess::updateCountdown(uint32_t seconds) {
char buf[32];
size_t size;
- writeField(_fInfo, "No Free Channel", true);
+ // make sure the string version is used
+ writeField(_fInfo, string("No Free Channel"), true);
size = snprintf(buf, sizeof(buf), "%lu s", seconds);
writeField(_fSw2, buf, size, true);
}
diff --git a/Layout/LayoutSweepProgress.cpp b/Layout/LayoutSweepProgress.cpp
index 36debef..9ddd536 100644
--- a/Layout/LayoutSweepProgress.cpp
+++ b/Layout/LayoutSweepProgress.cpp
@@ -35,7 +35,8 @@ void LayoutSweepProgress::updateCountdown(uint32_t seconds) {
char buf[16];
size_t size;
- writeField(_fCountdownLabel, "No Free Channel", true);
+ // make sure the string version is used
+ writeField(_fCountdownLabel, string("No Free Channel"), true);
size = snprintf(buf, sizeof(buf), "%lu s", seconds);
writeField(_fCountdown, buf, size, true);
}