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

T12 to use 9x navigation + navigation refactoring (#6474)

Browse Source 
* Move T12 to more suited 9x navigation

* Navigation refactoring

* Navigation refactoring continued

* Channels count in ACCESS mode fix (24 channels max)
This commit is contained in:
3djc
2019-06-04 08:49:39 +02:00
committed by Andre Bernet
parent d7330afb59
commit af9fe7fb63
11 changed files with 101 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/widgets.cpp
+7 -7
View File
@@ -102,7 +102,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
s_editMode = 0;
break;
#if defined(PCBXLITE) || !defined(PCBTARANIS)
#if defined(NAVIGATION_XLITE) || defined(NAVIGATION_9X)
case EVT_KEY_BREAK(KEY_LEFT):
if (cur>0) cur--;
break;
@@ -112,13 +112,13 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
break;
#endif
#if defined(PCBXLITE)
#if defined(NAVIGATION_XLITE)
case EVT_KEY_BREAK(KEY_SHIFT):
#elif defined(PCBTARANIS)
case EVT_KEY_LONG(KEY_ENTER):
#else
#elif defined(NAVIGATION_9X)
case EVT_KEY_LONG(KEY_LEFT):
case EVT_KEY_LONG(KEY_RIGHT):
#else
case EVT_KEY_LONG(KEY_ENTER):
#endif
if (attr & ZCHAR) {
@@ -133,7 +133,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
}
}
else {
#if !defined(PCBXLITE)
#if !defined(NAVIGATION_XLITE)
if (v == ' ') {
s_editMode = 0;
killEvents(event);
@@ -148,7 +148,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
v = 'A' + v - 'a'; // toggle case
}
}
#if !defined(PCBTARANIS)
#if defined(NAVIGATION_9X)
if (event==EVT_KEY_LONG(KEY_LEFT))
killEvents(KEY_LEFT);
#endif