From f85ed9440dbfc3dfdee470580f40e5ddc702d2df Mon Sep 17 00:00:00 2001 From: Krzysiek Egzmont Date: Sun, 28 Jan 2024 23:57:15 +0100 Subject: [PATCH] Refactor --- app/app.c | 136 +++++++++++++++++++++----------------------------- app/dtmf.c | 3 +- app/generic.c | 103 +++++++++++++++----------------------- misc.c | 2 +- misc.h | 2 +- radio.c | 2 +- 6 files changed, 102 insertions(+), 146 deletions(-) diff --git a/app/app.c b/app/app.c index f78c09f68..9d57f6f0a 100644 --- a/app/app.c +++ b/app/app.c @@ -750,21 +750,19 @@ static void HandleVox(void) return; #endif - if (gVoxResumeCountdown == 0) - { + if (gVoxResumeCountdown == 0) { if (gVoxPauseCountdown) return; } - else - { + else { g_VOX_Lost = false; gVoxPauseCountdown = 0; } - #ifdef ENABLE_FMRADIO - if (gFmRadioMode) - return; - #endif +#ifdef ENABLE_FMRADIO + if (gFmRadioMode) + return; +#endif if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) return; @@ -772,31 +770,26 @@ static void HandleVox(void) if (gScanStateDir != SCAN_OFF) return; - if (gVOX_NoiseDetected) - { + if (gVOX_NoiseDetected) { if (g_VOX_Lost) gVoxStopCountdown_10ms = vox_stop_count_down_10ms; else if (gVoxStopCountdown_10ms == 0) gVOX_NoiseDetected = false; - if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected) - { - if (gFlagEndTransmission) - { + if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected) { + if (gFlagEndTransmission) { //if (gCurrentFunction != FUNCTION_FOREGROUND) FUNCTION_Select(FUNCTION_FOREGROUND); } - else - { + else { APP_EndTransmission(); - if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0) - { + if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0) { //if (gCurrentFunction != FUNCTION_FOREGROUND) FUNCTION_Select(FUNCTION_FOREGROUND); } else - gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; + gRTTECountdown_10ms = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; } gUpdateStatus = true; @@ -806,15 +799,13 @@ static void HandleVox(void) return; } - if (g_VOX_Lost) - { + if (g_VOX_Lost) { gVOX_NoiseDetected = true; if (gCurrentFunction == FUNCTION_POWER_SAVE) FUNCTION_Select(FUNCTION_FOREGROUND); - if (gCurrentFunction != FUNCTION_TRANSMIT && !SerialConfigInProgress()) - { + if (gCurrentFunction != FUNCTION_TRANSMIT && !SerialConfigInProgress()) { #ifdef ENABLE_DTMF_CALLING gDTMF_ReplyState = DTMF_REPLY_NONE; #endif @@ -1156,8 +1147,7 @@ void APP_TimeSlice10ms(void) #endif } - if (gUpdateDisplay) - { + if (gUpdateDisplay) { gUpdateDisplay = false; GUI_DisplayScreen(); } @@ -1184,65 +1174,56 @@ void APP_TimeSlice10ms(void) gVoxPauseCountdown--; #endif - if (gCurrentFunction == FUNCTION_TRANSMIT) - { - #ifdef ENABLE_ALARM - if (gAlarmState == ALARM_STATE_TXALARM || gAlarmState == ALARM_STATE_SITE_ALARM) - { - uint16_t Tone; + if (gCurrentFunction == FUNCTION_TRANSMIT) { +#ifdef ENABLE_ALARM + if (gAlarmState == ALARM_STATE_TXALARM || gAlarmState == ALARM_STATE_SITE_ALARM) { + uint16_t Tone; - gAlarmRunningCounter++; - gAlarmToneCounter++; + gAlarmRunningCounter++; + gAlarmToneCounter++; - Tone = 500 + (gAlarmToneCounter * 25); - if (Tone > 1500) - { - Tone = 500; - gAlarmToneCounter = 0; - } + Tone = 500 + (gAlarmToneCounter * 25); + if (Tone > 1500) { + Tone = 500; + gAlarmToneCounter = 0; + } - BK4819_SetScrambleFrequencyControlWord(Tone); + BK4819_SetScrambleFrequencyControlWord(Tone); - if (gEeprom.ALARM_MODE == ALARM_MODE_TONE && gAlarmRunningCounter == 512) - { - gAlarmRunningCounter = 0; + if (gEeprom.ALARM_MODE == ALARM_MODE_TONE && gAlarmRunningCounter == 512) { + gAlarmRunningCounter = 0; - if (gAlarmState == ALARM_STATE_TXALARM) - { - gAlarmState = ALARM_STATE_SITE_ALARM; + if (gAlarmState == ALARM_STATE_TXALARM) { + gAlarmState = ALARM_STATE_SITE_ALARM; - RADIO_EnableCxCSS(); - BK4819_SetupPowerAmplifier(0, 0); - BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); - BK4819_Enable_AfDac_DiscMode_TxDsp(); - BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false); + RADIO_EnableCxCSS(); + BK4819_SetupPowerAmplifier(0, 0); + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); + BK4819_Enable_AfDac_DiscMode_TxDsp(); + BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false); - GUI_DisplayScreen(); - } - else - { - gAlarmState = ALARM_STATE_TXALARM; + GUI_DisplayScreen(); + } + else { + gAlarmState = ALARM_STATE_TXALARM; - GUI_DisplayScreen(); + GUI_DisplayScreen(); - BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true); - RADIO_SetTxParameters(); - BK4819_TransmitTone(true, 500); - SYSTEM_DelayMs(2); - AUDIO_AudioPathOn(); + BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true); + RADIO_SetTxParameters(); + BK4819_TransmitTone(true, 500); + SYSTEM_DelayMs(2); + AUDIO_AudioPathOn(); - gEnableSpeaker = true; - gAlarmToneCounter = 0; - } + gEnableSpeaker = true; + gAlarmToneCounter = 0; } } - #endif - + } +#endif // repeater tail tone elimination - if (gRTTECountdown > 0) - { - if (--gRTTECountdown == 0) - { + if (gRTTECountdown_10ms > 0) { + if (--gRTTECountdown_10ms == 0) { //if (gCurrentFunction != FUNCTION_FOREGROUND) FUNCTION_Select(FUNCTION_FOREGROUND); @@ -1253,11 +1234,9 @@ void APP_TimeSlice10ms(void) } #ifdef ENABLE_FMRADIO - if (gFmRadioMode && gFM_RestoreCountdown_10ms > 0) - { - if (--gFM_RestoreCountdown_10ms == 0) - { // switch back to FM radio mode - FM_Start(); + if (gFmRadioMode && gFM_RestoreCountdown_10ms > 0) { + if (--gFM_RestoreCountdown_10ms == 0) { + FM_Start(); // switch back to FM radio mode GUI_SelectNextDisplay(DISPLAY_FM); } } @@ -1267,8 +1246,7 @@ void APP_TimeSlice10ms(void) SCANNER_TimeSlice10ms(); #ifdef ENABLE_AIRCOPY - if (gScreenToDisplay == DISPLAY_AIRCOPY && gAircopyState == AIRCOPY_TRANSFER && gAirCopyIsSendMode == 1) - { + if (gScreenToDisplay == DISPLAY_AIRCOPY && gAircopyState == AIRCOPY_TRANSFER && gAirCopyIsSendMode == 1) { if (!AIRCOPY_SendMessage()) { GUI_DisplayScreen(); } @@ -1780,7 +1758,7 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0) FUNCTION_Select(FUNCTION_FOREGROUND); else - gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; + gRTTECountdown_10ms = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; if (Key == KEY_PTT) gPttWasPressed = true; diff --git a/app/dtmf.c b/app/dtmf.c index f94723eb8..c7635c0bc 100644 --- a/app/dtmf.c +++ b/app/dtmf.c @@ -89,8 +89,7 @@ void DTMF_SendEndOfTransmission(void) && gDTMF_CallState == DTMF_CALL_STATE_NONE #endif ) { // end-of-tx - if (gEeprom.DTMF_SIDE_TONE) - { + if (gEeprom.DTMF_SIDE_TONE) { AUDIO_AudioPathOn(); gEnableSpeaker = true; SYSTEM_DelayMs(60); diff --git a/app/generic.c b/app/generic.c index af91846a5..00f9205ec 100644 --- a/app/generic.c +++ b/app/generic.c @@ -39,17 +39,14 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) { - if (gInputBoxIndex > 0) - { + if (gInputBoxIndex > 0) { if (!bKeyHeld && bKeyPressed) // short pressed gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL; return; } - if (bKeyHeld || !bKeyPressed) // held or released - { - if (bKeyHeld || bKeyPressed) // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?) - { + if (bKeyHeld || !bKeyPressed) { // held or released + if (bKeyHeld || bKeyPressed) { // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?) if (!bKeyHeld) // won't ever pass return; @@ -58,31 +55,28 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) COMMON_KeypadLockToggle(); } - else // released - { - #ifdef ENABLE_FMRADIO - if ((gFmRadioMode || gScreenToDisplay != DISPLAY_MAIN) && gScreenToDisplay != DISPLAY_FM) - return; - #else - if (gScreenToDisplay != DISPLAY_MAIN) - return; - #endif + else { // released +#ifdef ENABLE_FMRADIO + if ((gFmRadioMode || gScreenToDisplay != DISPLAY_MAIN) && gScreenToDisplay != DISPLAY_FM) + return; +#else + if (gScreenToDisplay != DISPLAY_MAIN) + return; +#endif gWasFKeyPressed = !gWasFKeyPressed; // toggle F function if (gWasFKeyPressed) gKeyInputCountdown = key_input_timeout_500ms; - #ifdef ENABLE_VOICE - if (!gWasFKeyPressed) - gAnotherVoiceID = VOICE_ID_CANCEL; - #endif - +#ifdef ENABLE_VOICE + if (!gWasFKeyPressed) + gAnotherVoiceID = VOICE_ID_CANCEL; +#endif gUpdateStatus = true; } } - else // short pressed - { + else { // short pressed #ifdef ENABLE_FMRADIO if (gScreenToDisplay != DISPLAY_FM) #endif @@ -91,16 +85,13 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld) return; } - #ifdef ENABLE_FMRADIO - if (gFM_ScanState == FM_SCAN_OFF) // not scanning - { - gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; - return; - } - #endif - +#ifdef ENABLE_FMRADIO + if (gFM_ScanState == FM_SCAN_OFF) { // not scanning + gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; + return; + } +#endif gBeepToPlay = BEEP_440HZ_500MS; - gPttWasReleased = true; } } @@ -111,29 +102,24 @@ void GENERIC_Key_PTT(bool bKeyPressed) if (!bKeyPressed || SerialConfigInProgress()) { // PTT released - if (gCurrentFunction == FUNCTION_TRANSMIT) - { // we are transmitting .. stop - - if (gFlagEndTransmission) - { + if (gCurrentFunction == FUNCTION_TRANSMIT) { + // we are transmitting .. stop + if (gFlagEndTransmission) { FUNCTION_Select(FUNCTION_FOREGROUND); } - else - { + else { APP_EndTransmission(); if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0) FUNCTION_Select(FUNCTION_FOREGROUND); else - gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; + gRTTECountdown_10ms = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10; } gFlagEndTransmission = false; - - #ifdef ENABLE_VOX - gVOX_NoiseDetected = false; - #endif - +#ifdef ENABLE_VOX + gVOX_NoiseDetected = false; +#endif RADIO_SetVfoState(VFO_STATE_NORMAL); if (gScreenToDisplay != DISPLAY_MENU) // 1of11 .. don't close the menu @@ -146,27 +132,24 @@ void GENERIC_Key_PTT(bool bKeyPressed) // PTT pressed - if (SCANNER_IsScanning()) - { // CTCSS/CDCSS scanning .. stop - SCANNER_Stop(); + if (SCANNER_IsScanning()) { + SCANNER_Stop(); // CTCSS/CDCSS scanning .. stop goto cancel_tx; } - if (gScanStateDir != SCAN_OFF) - { // frequency/channel scanning . .stop - CHFRSCANNER_Stop(); + if (gScanStateDir != SCAN_OFF) { + CHFRSCANNER_Stop(); // frequency/channel scanning . .stop goto cancel_tx; } #ifdef ENABLE_FMRADIO - if (gFM_ScanState != FM_SCAN_OFF) - { // FM radio is scanning .. stop + if (gFM_ScanState != FM_SCAN_OFF) { // FM radio is scanning .. stop FM_PlayAndUpdate(); - #ifdef ENABLE_VOICE - gAnotherVoiceID = VOICE_ID_SCANNING_STOP; - #endif +#ifdef ENABLE_VOICE + gAnotherVoiceID = VOICE_ID_SCANNING_STOP; +#endif gRequestDisplayScreen = DISPLAY_FM; goto cancel_tx; } @@ -177,8 +160,7 @@ void GENERIC_Key_PTT(bool bKeyPressed) goto start_tx; // listening to the FM radio .. start TX'ing #endif - if (gCurrentFunction == FUNCTION_TRANSMIT && gRTTECountdown == 0) - { // already transmitting + if (gCurrentFunction == FUNCTION_TRANSMIT && gRTTECountdown_10ms == 0) {// already transmitting gInputBoxIndex = 0; return; } @@ -192,9 +174,7 @@ void GENERIC_Key_PTT(bool bKeyPressed) // was entering a DTMF string - if (gDTMF_InputBox_Index > 0 || gDTMF_PreviousIndex > 0) - { // going to transmit a DTMF string - + if (gDTMF_InputBox_Index > 0 || gDTMF_PreviousIndex > 0) { // going to transmit a DTMF string if (gDTMF_InputBox_Index == 0 && gDTMF_PreviousIndex > 0) gDTMF_InputBox_Index = gDTMF_PreviousIndex; // use the previous DTMF string @@ -225,8 +205,7 @@ void GENERIC_Key_PTT(bool bKeyPressed) goto done; cancel_tx: - if (gPttIsPressed) - { + if (gPttIsPressed) { gPttWasPressed = true; } diff --git a/misc.c b/misc.c index 653d4fd42..e322e3f61 100644 --- a/misc.c +++ b/misc.c @@ -143,7 +143,7 @@ volatile uint8_t gVFOStateResumeCountdown_500ms; bool gEnableSpeaker; uint8_t gKeyInputCountdown = 0; uint8_t gKeyLockCountdown; -uint8_t gRTTECountdown; +uint8_t gRTTECountdown_10ms; bool bIsInLockScreen; uint8_t gUpdateStatus; uint8_t gFoundCTCSS; diff --git a/misc.h b/misc.h index 0ace21500..ed81573e2 100644 --- a/misc.h +++ b/misc.h @@ -213,7 +213,7 @@ extern volatile uint16_t gTailNoteEliminationCountdown_10ms; extern bool gEnableSpeaker; extern uint8_t gKeyInputCountdown; extern uint8_t gKeyLockCountdown; -extern uint8_t gRTTECountdown; +extern uint8_t gRTTECountdown_10ms; extern bool bIsInLockScreen; extern uint8_t gUpdateStatus; extern uint8_t gFoundCTCSS; diff --git a/radio.c b/radio.c index 7b56a1110..5cda2e3fe 100644 --- a/radio.c +++ b/radio.c @@ -1002,7 +1002,7 @@ void RADIO_PrepareTX(void) gTxTimeoutReached = false; gFlagEndTransmission = false; - gRTTECountdown = 0; + gRTTECountdown_10ms = 0; #ifdef ENABLE_DTMF_CALLING gDTMF_ReplyState = DTMF_REPLY_NONE;