From 2ce10db3fe1e2254aeb57095152cfcdac57150d2 Mon Sep 17 00:00:00 2001 From: "mhotar@gmail.com" Date: Sun, 1 Dec 2013 22:36:28 +0100 Subject: [PATCH] No sw_read button for M64 --- transmitter/src/gui/menu_model.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/transmitter/src/gui/menu_model.cpp b/transmitter/src/gui/menu_model.cpp index dc5296b03..5597a93c7 100644 --- a/transmitter/src/gui/menu_model.cpp +++ b/transmitter/src/gui/menu_model.cpp @@ -961,7 +961,7 @@ void menuModelSetup(uint8_t event) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); #else #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) @@ -1149,12 +1149,22 @@ void menuModelSetup(uint8_t event) CASE_EVT_ROTARY_BREAK case EVT_KEY_BREAK(KEY_ENTER): killEvents(event); +#if defined(CPUM64) + g_model.nSwToWarn ^= (1 << m_posHorz); + eeDirty(EE_MODEL); +#else if (m_posHorz < NUM_SWITCHES-1) { g_model.nSwToWarn ^= (1 << m_posHorz); eeDirty(EE_MODEL); } +#endif break; case EVT_KEY_LONG(KEY_ENTER): +#if defined(CPUM64) + getMovedSwitch(); + g_model.switchWarningStates = switches_states; + eeDirty(EE_MODEL); +#else if (m_posHorz == NUM_SWITCHES-1) { s_noHi = NO_HI_LEN; getMovedSwitch(); @@ -1162,6 +1172,7 @@ void menuModelSetup(uint8_t event) AUDIO_WARNING1(); eeDirty(EE_MODEL); } +#endif break; } } @@ -1195,7 +1206,9 @@ void menuModelSetup(uint8_t event) attr |= INVERS; } lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr); - lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0); +#if !defined(CPUM64) + lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0); +#endif #endif } break; @@ -1231,6 +1244,7 @@ void menuModelSetup(uint8_t event) break; } #endif + case ITEM_MODEL_BEEP_CENTER: lcd_putsLeft(y, STR_BEEPCTR); for (uint8_t i=0; i