diff options
| -rw-r--r-- | Layout/LayoutDemoSampling.cpp | 3 | ||||
| -rw-r--r-- | Layout/LayoutJoin.cpp | 3 | ||||
| -rw-r--r-- | Layout/LayoutSurveyProgress.cpp | 3 | ||||
| -rw-r--r-- | Layout/LayoutSurveySuccess.cpp | 3 | ||||
| -rw-r--r-- | Layout/LayoutSweepProgress.cpp | 3 |
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); } |