Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 08:45:24 +03:00
Code Issues Wiki Activity

Fix key diag screen for256x128 range (was completely broken)

Browse source
This commit is contained in:
3djc 2019-06-24 08:53:42 +02:00
parent 74086231fb
commit a89898f36b
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
radio/src/gui/212x64/radio_diagkeys.cpp
View file

@ -30,30 +30,33 @@ void menuRadioDiagKeys(event_t event)
{
SIMPLE_SUBMENU(STR_MENU_RADIO_SWITCHES, 1);
lcdDrawText(14*FW, MENU_HEADER_HEIGHT + 1, STR_VTRIM);
lcdDrawText(24*FW, MENU_HEADER_HEIGHT + 1, STR_VTRIM);
for (uint8_t i=0; i<9; i++) {
for (uint8_t i=0; i<NUM_TRIMS_KEYS; i++) {
coord_t y;
if (i < NUM_TRIMS_KEYS) {
y = MENU_HEADER_HEIGHT + 1 + FH + FH*(i/2);
if (i&1) lcdDraw1bitBitmap(14*FW, y, sticks, i/2, 0);
displayKeyState(i&1? 20*FW : 18*FW, y, TRM_BASE+i);
}
y = MENU_HEADER_HEIGHT + 1 + FH + FH * (i / 2);
if (i & 1) lcdDraw1bitBitmap(24 * FW, y, sticks, i / 2, 0);
displayKeyState(i & 1 ? 30 * FW : 28 * FW, y, TRM_BASE + i);
}
if (i <= KEY_MAX) {
y = MENU_HEADER_HEIGHT + 1 + FH*i;
lcdDrawTextAtIndex(0, y, STR_VKEYS, (5-i), 0);
displayKeyState(5*FW+2, y, i);
}
for (uint8_t i=0; i<= KEY_MAX; i++) {
coord_t y;
if (i < NUM_SWITCHES) {
if (SWITCH_EXISTS(i)) {
y = MENU_HEADER_HEIGHT + 1 + FH*i;
getvalue_t val = getValue(MIXSRC_FIRST_SWITCH+i);
getvalue_t sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3));
drawSwitch(8*FW+4, y, sw, 0);
}
y = MENU_HEADER_HEIGHT + 1 + FH * i;
lcdDrawTextAtIndex(0, y, STR_VKEYS, (i), 0);
displayKeyState(5 * FW + 2, y, i);
}
for (uint8_t i=0, cnt=0; i<= NUM_SWITCHES; i++) {
coord_t y,x;
if(SWITCH_EXISTS(i)) {
x = 4*FH*(cnt/6);
y = MENU_HEADER_HEIGHT + 1 + FH*((cnt++)%6);
getvalue_t val = getValue(MIXSRC_FIRST_SWITCH+i);
getvalue_t sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3));
drawSwitch(8*FW+x, y, sw, 0);
}
}