[rotenc] Many little enhancements

[sky9x] General Menu Alarms misaligned
This commit is contained in:
bsongis
2012-11-08 17:36:56 +00:00
parent ba65591076
commit 91747475c8
10 changed files with 34 additions and 17 deletions
+6
View File
@@ -335,7 +335,13 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
chainMenu((MenuFuncP)pgm_read_adr(&menuTab[cc])); chainMenu((MenuFuncP)pgm_read_adr(&menuTab[cc]));
return false; return false;
} }
#if defined(ROTARY_ENCODERS)
if (g_eeGeneral.reNavigation && s_editMode < 0)
attr = INVERS|BLINK;
#endif
} }
s_noScroll = 0; s_noScroll = 0;
displayScreenIndex(curr, menuTabSize, attr); displayScreenIndex(curr, menuTabSize, attr);
+2 -2
View File
@@ -174,9 +174,9 @@ if (!check_simple(event,menu,tab,DIM(tab),(lines_count)-1)) return;
SIMPLE_MENU_NOTITLE(tab, menu, lines_count); \ SIMPLE_MENU_NOTITLE(tab, menu, lines_count); \
TITLE(title) TITLE(title)
#define SUBMENU_NOTITLE(lines_count, ...) \ #define SUBMENU_NOTITLE(lines_count, ...) { \
static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \ static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \
if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,(lines_count)-1)) return; if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,(lines_count)-1)) return; }
#define SUBMENU(title, lines_count, ...) \ #define SUBMENU(title, lines_count, ...) \
static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \ static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \
+11
View File
@@ -418,7 +418,11 @@ void menuModelSelect(uint8_t event)
lcd_outdezAtt(17*FW, 0, reusableBuffer.models.eepromfree, 0); lcd_outdezAtt(17*FW, 0, reusableBuffer.models.eepromfree, 0);
#endif #endif
#if defined(ROTARY_ENCODERS)
displayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? ((g_eeGeneral.reNavigation && s_editMode < 0) ? INVERS|BLINK : INVERS) : 0);
#else
displayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? INVERS : 0); displayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? INVERS : 0);
#endif
if (sub-s_pgOfs < 1) s_pgOfs = max(0, sub-1); if (sub-s_pgOfs < 1) s_pgOfs = max(0, sub-1);
else if (sub-s_pgOfs > 5) s_pgOfs = min(MAX_MODELS-7, sub-4); else if (sub-s_pgOfs > 5) s_pgOfs = min(MAX_MODELS-7, sub-4);
@@ -1710,7 +1714,14 @@ void menuModelMixOne(uint8_t event)
MixData *md2 = mixaddress(s_currIdx) ; MixData *md2 = mixaddress(s_currIdx) ;
putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0); putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0);
#if defined(ROTARY_ENCODERS)
if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS)
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 0, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/})
else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
#else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/}); SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
#endif
int8_t sub = m_posVert; int8_t sub = m_posVert;
int8_t editMode = s_editMode; int8_t editMode = s_editMode;
+2 -2
View File
@@ -422,8 +422,8 @@
#define TR_CPU_MAH "Spot\206eba" #define TR_CPU_MAH "Spot\206eba"
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Tepl. MB \016>" #define TR_COPROC_TEMP "Tepl. MB \016>"
#define TR_CAPAWARNING "Alarm Kapacity" #define TR_CAPAWARNING INDENT "Kapacity Low"
#define TR_TEMPWARNING "Alarm Teploty" #define TR_TEMPWARNING INDENT "Teploty High"
#define TR_FUNC "Fce." #define TR_FUNC "Fce."
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+2 -2
View File
@@ -423,8 +423,8 @@
#define TR_CPU_MAH "Consumpt." #define TR_CPU_MAH "Consumpt."
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB temp. \007>" #define TR_COPROC_TEMP "MB temp. \007>"
#define TR_CAPAWARNING "Capacity Warning" #define TR_CAPAWARNING INDENT "Capacity Low"
#define TR_TEMPWARNING "Temp Warning" #define TR_TEMPWARNING INDENT "Temp High"
#define TR_FUNC "Func" #define TR_FUNC "Func"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+2 -2
View File
@@ -428,8 +428,8 @@
#define TR_CPU_MAH "Consumpt." #define TR_CPU_MAH "Consumpt."
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp. \016>" #define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_CAPAWARNING "Capacity Warning" #define TR_CAPAWARNING INDENT "Capacity Low"
#define TR_TEMPWARNING "Temp Warning" #define TR_TEMPWARNING INDENT "Temp High"
#define TR_FUNC "Func" #define TR_FUNC "Func"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+3 -3
View File
@@ -389,7 +389,7 @@
#define TR_RXNUM "RxNum" #define TR_RXNUM "RxNum"
#define TR_SYNCMENU "Sync [MENU]" #define TR_SYNCMENU "Sync [MENU]"
#define TR_BACK "Atras" #define TR_BACK "Atras"
#define TR_LIMIT INDENT"Limit" #define TR_LIMIT INDENT "Limit"
#define TR_MINRSSI "Min Rssi" #define TR_MINRSSI "Min Rssi"
#define TR_LATITUDE "Latitud" #define TR_LATITUDE "Latitud"
#define TR_LONGITUDE "Longitud" #define TR_LONGITUDE "Longitud"
@@ -422,8 +422,8 @@
#define TR_CPU_MAH "Consum." #define TR_CPU_MAH "Consum."
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp. \016>" #define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_CAPAWARNING "Aviso Capacidad" #define TR_CAPAWARNING INDENT "Capacidad Low"
#define TR_TEMPWARNING "Aviso Temperat." #define TR_TEMPWARNING INDENT "Temperat High"
#define TR_FUNC "Funcion" #define TR_FUNC "Funcion"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+2 -2
View File
@@ -428,8 +428,8 @@
#define TR_CPU_MAH "Consomm." #define TR_CPU_MAH "Consomm."
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Temp. MB \016>" #define TR_COPROC_TEMP "Temp. MB \016>"
#define TR_CAPAWARNING "Alerte capacit\200" #define TR_CAPAWARNING INDENT "Capacit\200 Basse"
#define TR_TEMPWARNING "Alerte temp" #define TR_TEMPWARNING INDENT "Temp Haute"
#define TR_FUNC "Fonc" #define TR_FUNC "Fonc"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+2 -2
View File
@@ -426,8 +426,8 @@
#define TR_CPU_MAH "Consumo" #define TR_CPU_MAH "Consumo"
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Temp. MB \016>" #define TR_COPROC_TEMP "Temp. MB \016>"
#define TR_CAPAWARNING "Avviso Capacita'" #define TR_CAPAWARNING INDENT "Capacita Low"
#define TR_TEMPWARNING "Avviso Temp." #define TR_TEMPWARNING INDENT "Temp High"
#define TR_FUNC "Funz" #define TR_FUNC "Funz"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
+2 -2
View File
@@ -431,8 +431,8 @@
#define TR_CPU_MAH "F\202rbrukn." #define TR_CPU_MAH "F\202rbrukn."
#define TR_COPROC "CoProc." #define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB temp. \016>" #define TR_COPROC_TEMP "MB temp. \016>"
#define TR_CAPAWARNING "Kapacitetsvarning" #define TR_CAPAWARNING INDENT "Kapacite Low"
#define TR_TEMPWARNING "Tempvarning " #define TR_TEMPWARNING INDENT "Temp High"
#define TR_FUNC "Funk" #define TR_FUNC "Funk"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"