UI: exit from macro menu on PTT press
This commit is contained in:
parent
e2c70bd4fd
commit
c60445d5be
|
|
@ -1374,6 +1374,13 @@ void ui_updateFSM(bool *sync_rtx)
|
||||||
}
|
}
|
||||||
#endif // PLATFORM_TTWRPLUS
|
#endif // PLATFORM_TTWRPLUS
|
||||||
|
|
||||||
|
// Unlatch and exit from macro menu on PTT press
|
||||||
|
if(macro_latched && txOngoing)
|
||||||
|
{
|
||||||
|
macro_latched = false;
|
||||||
|
macro_menu = false;
|
||||||
|
}
|
||||||
|
|
||||||
long long now = getTick();
|
long long now = getTick();
|
||||||
// Process pressed keys
|
// Process pressed keys
|
||||||
if(event.type == EVENT_KBD)
|
if(event.type == EVENT_KBD)
|
||||||
|
|
@ -2451,8 +2458,6 @@ void ui_updateFSM(bool *sync_rtx)
|
||||||
|
|
||||||
if (txOngoing || rtx_rxSquelchOpen())
|
if (txOngoing || rtx_rxSquelchOpen())
|
||||||
{
|
{
|
||||||
if (txOngoing)
|
|
||||||
macro_latched = 0;
|
|
||||||
_ui_exitStandby(now);
|
_ui_exitStandby(now);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue