piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hard coded special characters (#2538)

Browse Source 
* fix(B&W): delta character in outputs

* fix: more special characters

* fix: NV14 compilation
This commit is contained in:
Raphael Coeffic
2022-10-13 17:27:45 +10:00
committed by GitHub
parent 9bfb36a587
commit 1766b7d6c0
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/lcd.cpp
+7 -7
View File
@@ -734,11 +734,11 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
idx = idx - MIXSRC_Rud;
if (g_eeGeneral.anaNames[idx][0]) {
if (idx < MIXSRC_FIRST_POT-MIXSRC_Rud )
lcdDrawChar(x, y, '\207', att); // stick symbol
lcdDrawSizedText(x, y, STR_CHAR_STICK, 2, att);
else if (idx <= MIXSRC_LAST_POT-MIXSRC_Rud )
lcdDrawChar(x, y, '\210', att); // pot symbol
lcdDrawSizedText(x, y, STR_CHAR_POT, 2, att);
else
lcdDrawChar(x, y, '\211', att); // slider symbol
lcdDrawSizedText(x, y, STR_CHAR_SLIDER, 2, att);
lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, att);
}
else {
@@ -751,20 +751,20 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
if(idx >= MIXSRC_FIRST_FS_SWITCH) {
idx = idx-(MIXSRC_FIRST_SWITCH+NUM_REGULAR_SWITCHES);
if (ZEXIST(g_model.switchNames[idx])) {
lcdDrawChar(x, y, '\214', att); //switch symbol
lcdDrawSizedText(x, y, STR_CHAR_SWITCH, 2, att);
lcdDrawSizedText(lcdNextPos, y, g_model.switchNames[idx], LEN_SWITCH_NAME, att);
}
else {
char s[LEN_SWITCH_NAME] = {'S', 'W'};
s[LEN_SWITCH_NAME-1] = '1' + idx;
lcdDrawChar(x, y, '\214', att); //switch symbol
lcdDrawSizedText(x, y, STR_CHAR_SWITCH, 2, att);
lcdDrawSizedText(lcdNextPos, y, s, LEN_SWITCH_NAME, att);
}
}
else {
idx = idx-MIXSRC_FIRST_SWITCH;
if (ZEXIST(g_eeGeneral.switchNames[idx])) {
lcdDrawChar(x, y, '\214', att); //switch symbol
lcdDrawSizedText(x, y, STR_CHAR_SWITCH, 2, att);
lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, att);
}
else
@@ -773,7 +773,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
#else
idx = idx-MIXSRC_FIRST_SWITCH;
if (ZEXIST(g_eeGeneral.switchNames[idx])) {
lcdDrawChar(x, y, '\214', att); //switch symbol
lcdDrawSizedText(x, y, STR_CHAR_SWITCH, 2, att); //switch symbol
lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, att);
}
else
radio/src/gui/128x64/model_outputs.cpp
+3 -2
View File
@@ -184,7 +184,8 @@ void menuModelLimitsOne(event_t event)
#if defined(PPM_LIMITS_SYMETRICAL)
case ITEM_OUTPUTONE_SYMETRICAL:
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_SUBTRIMMODE);
lcdDrawChar(LIMITS_ONE_2ND_COLUMN, y, ld->symetrical ? '=' : '\206', attr);
lcdDrawSizedText(LIMITS_ONE_2ND_COLUMN, y,
ld->symetrical ? "=" : STR_CHAR_DELTA, 2, attr);
if (active) {
CHECK_INCDEC_MODELVAR_ZERO(event, ld->symetrical, 1);
}
@@ -333,7 +334,7 @@ void menuModelLimits(event_t event)
break;
case ITEM_OUTPUTS_SYMETRICAL:
lcdDrawChar(LCD_W-FW, y, ld->symetrical ? '=' : '\206', 0);
lcdDrawSizedText(LCD_W-FW, y, ld->symetrical ? "=" : STR_CHAR_DELTA, 2, 0);
break;
}
}
radio/src/gui/212x64/lcd.cpp
+4 -4
View File
@@ -657,11 +657,11 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
idx = idx-MIXSRC_Rud;
if (g_eeGeneral.anaNames[idx][0]) {
if (idx < MIXSRC_FIRST_POT-MIXSRC_Rud )
lcdDrawChar(x, y, '\207', att); //stick symbol
lcdDrawSizedText(x, y, STR_CHAR_STICK, 2, att);
else if (idx < MIXSRC_FIRST_SLIDER-MIXSRC_Rud )
lcdDrawChar(x, y, '\210', att); //pot symbol
lcdDrawSizedText(x, y, STR_CHAR_POT, 2, att);
else
lcdDrawChar(x, y, '\211', att); //slider symbol
lcdDrawSizedText(x, y, STR_CHAR_SLIDER, 2, att);
lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, att);
}
else
@@ -670,7 +670,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
idx = idx - MIXSRC_FIRST_SWITCH;
if (g_eeGeneral.switchNames[idx][0]) {
lcdDrawChar(x, y, '\212', att); //switch symbol
lcdDrawSizedText(x, y, STR_CHAR_SWITCH, 2, att);
lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, att);
}
else {
radio/src/gui/212x64/model_outputs.cpp
+2 -1
View File
@@ -234,7 +234,8 @@ void menuModelLimits(event_t event)
#if defined(PPM_LIMITS_SYMETRICAL)
case ITEM_LIMITS_SYMETRICAL:
lcdDrawChar(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, ld->symetrical ? '=' : '\206', attr);
lcdDrawSizedText(LCD_W - FW - MENUS_SCROLLBAR_WIDTH, y,
ld->symetrical ? "=" : STR_CHAR_DELTA, 2, attr);
if (active) {
CHECK_INCDEC_MODELVAR_ZERO(event, ld->symetrical, 1);
}
radio/src/gui/colorlcd/keyboard_curve.cpp
+6 -5
View File
@@ -21,7 +21,8 @@
#include "keyboard_curve.h"
#include "button.h"
#include "lcd.h"
#include "translations/untranslated.h"
constexpr coord_t KEYBOARD_HEIGHT = 110;
@@ -31,28 +32,28 @@ CurveKeyboard::CurveKeyboard() :
Keyboard(KEYBOARD_HEIGHT)
{
// up
new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, "\200",
new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, STR_CHAR_UP,
[=]() -> uint8_t {
pushEvent(EVT_VIRTUAL_KEY_UP);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// down
new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201",
new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, STR_CHAR_DOWN,
[=]() -> uint8_t {
pushEvent(EVT_VIRTUAL_KEY_DOWN);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// left
left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177",
left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, STR_CHAR_LEFT,
[=]() -> uint8_t {
pushEvent(EVT_VIRTUAL_KEY_LEFT);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// right
right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176",
right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, STR_CHAR_RIGHT,
[=]() -> uint8_t {
pushEvent(EVT_VIRTUAL_KEY_RIGHT);
return 0;