From 0b2cb334af062cdc51b9cd66afd39e4d3c7d965a Mon Sep 17 00:00:00 2001 From: Malte Langermann <54738901+gagarinlg@users.noreply.github.com> Date: Sun, 25 Sep 2022 10:42:07 +0200 Subject: [PATCH] =?UTF-8?q?=20fix(color):=20`@`=20displayed=20on=20radios?= =?UTF-8?q?=20instead=20of=20`=C2=B0`=20(#2347)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: curve selector for predefined curves now shows °, instead of @ --- radio/src/gui/colorlcd/draw_functions.cpp | 4 ++-- radio/src/gui/colorlcd/model_curves.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/draw_functions.cpp b/radio/src/gui/colorlcd/draw_functions.cpp index 15bedead4..8fdd71ba3 100644 --- a/radio/src/gui/colorlcd/draw_functions.cpp +++ b/radio/src/gui/colorlcd/draw_functions.cpp @@ -365,10 +365,10 @@ void drawDate(BitmapBuffer * dc, coord_t x, coord_t y, TelemetryItem & telemetry coord_t drawGPSCoord(BitmapBuffer * dc, coord_t x, coord_t y, int32_t value, const char * direction, LcdFlags flags, bool seconds=true) { - char s[32]; + char s[32] = {}; uint32_t absvalue = abs(value); char * tmp = strAppendUnsigned(s, absvalue / 1000000); - *tmp++ = '@'; + tmp = strAppend(tmp, "°"); absvalue = absvalue % 1000000; absvalue *= 60; if (g_eeGeneral.gpsFormat == 0 || !seconds) { diff --git a/radio/src/gui/colorlcd/model_curves.cpp b/radio/src/gui/colorlcd/model_curves.cpp index 7b3920bbb..0961554cf 100644 --- a/radio/src/gui/colorlcd/model_curves.cpp +++ b/radio/src/gui/colorlcd/model_curves.cpp @@ -334,7 +334,7 @@ void ModelCurvesPage::build(FormWindow * window, int8_t focusIndex) Menu *menu = new Menu(window); for (int angle = -45; angle <= 45; angle += 15) { char label[16]; - strAppend(strAppendSigned(label, angle), "@"); + strAppend(strAppendSigned(label, angle), "°"); menu->addLine(label, [=]() { int dx = 2000 / (5 + curve.points - 1); for (uint8_t i = 0; i < 5 + curve.points; i++) {