A better way to cancel DSM2 range-check mode on [EXIT long]. Thanks Bertrand (again!).
This commit is contained in:
@@ -476,9 +476,6 @@ uint8_t m_posHorz;
|
|||||||
void popMenu()
|
void popMenu()
|
||||||
{
|
{
|
||||||
if (g_menuStackPtr>0) {
|
if (g_menuStackPtr>0) {
|
||||||
#ifdef DSM2
|
|
||||||
s_rangecheck_mode = 0;
|
|
||||||
#endif
|
|
||||||
g_menuStackPtr = g_menuStackPtr-1;
|
g_menuStackPtr = g_menuStackPtr-1;
|
||||||
AUDIO_KEYPAD_UP();
|
AUDIO_KEYPAD_UP();
|
||||||
m_posHorz = 0;
|
m_posHorz = 0;
|
||||||
|
|||||||
@@ -578,6 +578,12 @@ void menuProcModel(uint8_t event)
|
|||||||
lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
|
lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
|
||||||
|
|
||||||
uint8_t protocol = g_model.protocol;
|
uint8_t protocol = g_model.protocol;
|
||||||
|
|
||||||
|
#ifdef DSM2
|
||||||
|
if (event == EVT_KEY_LONG(KEY_EXIT))
|
||||||
|
s_rangecheck_mode = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
|
MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
|
||||||
|
|
||||||
uint8_t sub = m_posVert - 1;
|
uint8_t sub = m_posVert - 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user