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

fix(bw): 'keys' debug view missing trims, corrupt names, alignment (#4934)

Browse Source
This commit is contained in:
philmoz
2024-05-03 13:55:54 +10:00
committed by GitHub
parent faa74267c8
commit 685411e025
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/bitmaps/sticks.xbm
+7 -7
View File
@@ -1,11 +1,11 @@
#define sticks_4x1_width 18
#define sticks_4x1_height 32
static unsigned char sticks_4x1_bits[] = {
#define sticks_width 18
#define sticks_height 32
static unsigned char sticks_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x88, 0x00, 0x44, 0x00, 0x00,
0xfe, 0x24, 0x01, 0x44, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x20, 0x00,
0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x70, 0x88, 0x00, 0x20, 0x00, 0x00,
0x20, 0x24, 0x01, 0x20, 0x00, 0x00, 0x70, 0x88, 0x00, 0x20, 0x20, 0x00,
0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x44, 0x38, 0x00, 0x00, 0x10, 0x00,
0x92, 0x10, 0x00, 0x00, 0x10, 0x00, 0x44, 0x38, 0x00, 0x10, 0x10, 0x00,
0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x38, 0x88, 0x00, 0x10, 0x00, 0x00,
0x10, 0x24, 0x01, 0x10, 0x00, 0x00, 0x38, 0x88, 0x00, 0x10, 0x20, 0x00,
0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x44, 0x70, 0x00, 0x00, 0x20, 0x00,
0x92, 0x20, 0x00, 0x00, 0x20, 0x00, 0x44, 0x70, 0x00, 0x10, 0x20, 0x00,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x88, 0x00,
0x92, 0xfc, 0x01, 0x00, 0x88, 0x00, 0x44, 0x00, 0x00, 0x10, 0x00, 0x00 };
radio/src/gui/128x64/radio_diagkeys.cpp
+15 -4
View File
@@ -77,20 +77,31 @@ void menuRadioDiagKeys(event_t event)
{
SIMPLE_SUBMENU(STR_MENU_RADIO_SWITCHES, 1);
lcdDrawText(14*FW, MENU_HEADER_HEIGHT + 1, STR_VTRIM);
uint8_t trim_yo = 1;
if (keysGetMaxTrims() < 8) {
lcdDrawText(14*FW, 1, STR_VTRIM, INVERS);
trim_yo = MENU_HEADER_HEIGHT + 1;
}
for (uint8_t i = 0; i < 10; i++) {
for (uint8_t i = 0; i < 16; i++) {
coord_t y;
if (i < keysGetMaxTrims() * 2) {
y = MENU_HEADER_HEIGHT + 1 + FH + FH * (i / 2);
y = trim_yo + FH * (i / 2);
#if defined(SURFACE_RADIO)
if (i & 1) {
lcdDrawText(14 * FW, y, "T");
lcdDrawNumber(lcdNextPos, y, 1 + i / 2);
}
#else
if (i & 1) lcdDraw1bitBitmap(14 * FW, y, sticks, i / 2, 0);
if (i & 1) {
if (i < 8) {
lcdDraw1bitBitmap(14 * FW, y, sticks, i / 2, INVERS);
} else {
lcdDrawText(14 * FW, y, "T");
lcdDrawNumber(lcdNextPos, y, 1 + i / 2);
}
}
#endif
displayTrimState(i & 1 ? 20 * FW : 18 * FW, y, i);
}