diff --git a/Makefile b/Makefile index dab52ef..e8e1911 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ ENABLE_FMRADIO := 0 ENABLE_NOAA := 0 ENABLE_VOICE := 0 ENABLE_ALARM := 0 -ENABLE_TX1750 := 0 +ENABLE_TX1750 := 1 ENABLE_BIG_FREQ := 0 ENABLE_SMALL_BOLD := 1 ENABLE_KEEP_MEM_NAME := 1 diff --git a/app/action.c b/app/action.c index 68ddf14..976952e 100644 --- a/app/action.c +++ b/app/action.c @@ -236,7 +236,7 @@ void ACTION_Vox(void) } #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) - static void ACTION_AlarmOr1750(bool b1750) + static void ACTION_AlarmOr1750(const bool b1750) { gInputBoxIndex = 0; @@ -252,7 +252,7 @@ void ACTION_Vox(void) gFlagPrepareTX = true; -// if (gScreenToDisplay != DISPLAY_MENU) // 1of11 .. don't close the menu + if (gScreenToDisplay != DISPLAY_MENU) // 1of11 .. don't close the menu gRequestDisplayScreen = DISPLAY_MAIN; } #endif diff --git a/app/app.c b/app/app.c index 395d331..1b8dea8 100644 --- a/app/app.c +++ b/app/app.c @@ -2262,10 +2262,12 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) } #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) else - if (!bKeyHeld && bKeyPressed) + if ((!bKeyHeld && bKeyPressed) || (gAlarmState == ALARM_STATE_TX1750 && bKeyHeld && !bKeyPressed)) { ALARM_Off(); + // TODO: fix side key 1750, you have to press it twice to restart the tone :( + if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0) { //if (gCurrentFunction != FUNCTION_FOREGROUND) @@ -2278,6 +2280,8 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) gPttWasPressed = true; else gPttWasReleased = true; + + bKeyHeld = false; } #endif } diff --git a/firmware.bin b/firmware.bin index f45bd03..2e9610e 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index f03947a..07e7aa0 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/main.c b/ui/main.c index 12560ee..dff9c30 100644 --- a/ui/main.c +++ b/ui/main.c @@ -89,6 +89,11 @@ center_line_t center_line = CENTER_LINE_NONE; if (gCurrentFunction != FUNCTION_TRANSMIT) return; + #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750) + if (gAlarmState != ALARM_STATE_OFF) + return; + #endif + const unsigned int voice_amp = BK4819_GetVoiceAmplitudeOut(); // 15:0 // const unsigned int max = 65535;