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

2.4 continued (#8092)

Browse Source 
Quite a bit of work on 2.4

Co-authored-by: 3djc <Th1sisfmyofmyo>
This commit is contained in:
3djc
2020-11-14 14:55:37 +04:00
committed by GitHub
co-authored by 3djc <Th1sisfmyofmyo>
parent cd6aa7af00
commit 87cd9047b1
238 changed files with 5164 additions and 2755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/view_main.cpp
+18 -11
View File
@@ -649,26 +649,33 @@ void menuMainView(event_t event)
drawSwitch(x, y, sw, 0, false);
}
}
#elif defined(PCBTANGO) || defined(PCBMAMBO)
//TODO : move switchReOrder definition in board.h and define SWITCHES_REORDER
static const uint8_t switchReOrder[] = {0, 1, 5, 3, 2, 4};
#elif defined(PCBTANGO)
int sw_i;
for (int i = 0; i < NUM_SWITCHES; ++i) {
if (SWITCH_EXISTS(i)) {
#if defined(LCD_H >= 96)
uint8_t x = 2 * FW - 2, y = 4 * FH + i * FH + 20;
#else
uint8_t x = 2 * FW - 2, y = 4 * FH + i * FH + 1;
#endif
if (i >= NUM_SWITCHES / 2) {
x = 16 * FW + 6;
y -= (NUM_SWITCHES / 2) * FH;
}
//TDOD : move switchesReorder definition in board.h
static const uint8_t switchesReorder[] = {0, 1, 5, 3, 2, 4};
#if defined(SWITCHES_REORDER)
// re-arrange order according to physical layout
i = switchReOrder[i];
#endif
i = switchesReorder[i];
getvalue_t val = getValue(MIXSRC_FIRST_SWITCH + sw_i);
getvalue_t sw = ((val < 0) ? 3 * sw_i + 1 : ((val == 0) ? 3 * sw_i + 2 : 3 * sw_i + 3));
drawSwitch(x, y, sw, 0);
}
}
#elif defined(PCBMAMBO)
for (int i = 0; i < NUM_SWITCHES; ++i) {
if (SWITCH_EXISTS(i)) {
uint8_t x = 2 * FW - 2, y = 4 * FH + i * FH + 1;
if (i >= NUM_SWITCHES / 2) {
x = 16 * FW + 6;
y -= (NUM_SWITCHES / 2) * FH;
}
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(x, y, sw, 0);