From 070d24ef66627709ecf3ac94c73ad4c1fcad1096 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 11 Jan 2017 10:02:54 +0100 Subject: [PATCH] fix curves on X7 (#4216) * fix curve selection display on X7 * Fix undue telemety type row being show on telem screen * Fix undue telemety type row being show on telem screen (reverted from commit f3d082f44fa70020d0787d7e7d3d5b494ef062b7) --- radio/src/gui/128x64/lcd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 228d9665c..e49a7face 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -1020,6 +1020,11 @@ void drawSwitch(coord_t x, coord_t y, swsrc_t idx, LcdFlags att) void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att) { +#if defined(CPUARM) + char s[8]; + getCurveString(s, idx); + lcdDrawText(x, y, s, att); +#else // CPUARM if (idx < 0) { lcdDrawChar(x-3, y, '!', att); idx = -idx+CURVE_BASE-1; @@ -1028,6 +1033,7 @@ void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att) lcdDrawTextAtIndex(x, y, STR_VCURVEFUNC, idx, att); else drawStringWithIndex(x, y, STR_CV, idx-CURVE_BASE+1, att); +#endif // CPUARM } void drawTimerMode(coord_t x, coord_t y, int8_t mode, LcdFlags att)