diff --git a/app/generic.c b/app/generic.c index d0b883f..af91846 100644 --- a/app/generic.c +++ b/app/generic.c @@ -83,7 +83,9 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) } else // short pressed { +#ifdef ENABLE_FMRADIO if (gScreenToDisplay != DISPLAY_FM) +#endif { gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; return; @@ -221,17 +223,24 @@ start_tx: // request start TX gFlagPrepareTX = true; goto done; - + cancel_tx: if (gPttIsPressed) { gPttWasPressed = true; } -done: +done: gPttDebounceCounter = 0; - if (gScreenToDisplay != DISPLAY_MENU && gRequestDisplayScreen != DISPLAY_FM) // 1of11 .. don't close the menu + if (gScreenToDisplay != DISPLAY_MENU +#ifdef ENABLE_FMRADIO + && gRequestDisplayScreen != DISPLAY_FM +#endif + ) { + // 1of11 .. don't close the menu gRequestDisplayScreen = DISPLAY_MAIN; + } + gUpdateStatus = true; gUpdateDisplay = true; }