From bd6ca8f8477d4e41ab1f74059c1cc9cb805f97e5 Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Tue, 26 Sep 2023 06:51:36 +0100 Subject: [PATCH] Fixed missing '{' when 'ENABLE_ALARM' is enabled --- driver/bk4819.c | 94 ++++++++++++++++++++++---------------------- firmware.bin | Bin 53212 -> 53212 bytes firmware.packed.bin | Bin 53230 -> 53230 bytes ui/menu.c | 4 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/driver/bk4819.c b/driver/bk4819.c index 6fe3571..ab74153 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -555,87 +555,87 @@ void BK4819_SetFilterBandwidth(const BK4819_FilterBandwidth_t Bandwidth, const b // 1 = 6dB if (Bandwidth == BK4819_FILTER_BW_WIDE) - { + { // 25kHz if (weak_no_different) - { // make the bandwidth the same with weak signals (sounds much better) + { // make the RX bandwidth the same with weak signals (sounds better) BK4819_WriteRegister(BK4819_REG_43, - (0u << 15) | // 0 - (3u << 12) | // 3 RF filter bandwidth + (0u << 15) | // 0 + (3u << 12) | // 3 RF filter bandwidth (3u << 9) | // *0 RF filter bandwidth when signal is weak - (7u << 6) | // *0 AFTxLPF2 filter Band Width - (2u << 4) | // 2 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (6u << 6) | // *0 AFTxLPF2 filter Band Width + (2u << 4) | // 2 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } else - { + { // with weak RX signals the RX bandwidth is reduced BK4819_WriteRegister(BK4819_REG_43, // 0x3028); // 0 011 000 000 10 1 0 00 - (0u << 15) | // 0 - (3u << 12) | // 3 RF filter bandwidth + (0u << 15) | // 0 + (3u << 12) | // 3 RF filter bandwidth (1u << 9) | // *0 RF filter bandwidth when signal is weak - (7u << 6) | // *0 AFTxLPF2 filter Band Width - (2u << 4) | // 2 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (6u << 6) | // *0 AFTxLPF2 filter Band Width + (2u << 4) | // 2 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } } else if (Bandwidth == BK4819_FILTER_BW_NARROW) - { + { // 12.5kHz if (weak_no_different) { BK4819_WriteRegister(BK4819_REG_43, // 0x4048); // 0 100 000 001 00 1 0 00 - (0u << 15) | // 0 - (3u << 12) | // 4 RF filter bandwidth + (0u << 15) | // 0 + (3u << 12) | // 4 RF filter bandwidth (3u << 9) | // *0 RF filter bandwidth when signal is weak (0u << 6) | // *1 AFTxLPF2 filter Band Width - (0u << 4) | // 0 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (0u << 4) | // 0 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } else { BK4819_WriteRegister(BK4819_REG_43, // 0x4048); // 0 100 000 001 00 1 0 00 - (0u << 15) | // 0 - (3u << 12) | // 4 RF filter bandwidth + (0u << 15) | // 0 + (3u << 12) | // 4 RF filter bandwidth (1u << 9) | // *0 RF filter bandwidth when signal is weak (0u << 6) | // *1 AFTxLPF2 filter Band Width - (0u << 4) | // 0 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (0u << 4) | // 0 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } } else if (Bandwidth == BK4819_FILTER_BW_NARROWER) - { + { // 6.25kHz if (weak_no_different) { BK4819_WriteRegister(BK4819_REG_43, - (0u << 15) | // 0 - (2u << 12) | // 4 RF filter bandwidth - (2u << 9) | // 0 RF filter bandwidth when signal is weak - (1u << 6) | // 1 AFTxLPF2 filter Band Width - (1u << 4) | // 1 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (0u << 15) | // 0 + (2u << 12) | // 4 RF filter bandwidth + (2u << 9) | // 0 RF filter bandwidth when signal is weak + (1u << 6) | // 1 AFTxLPF2 filter Band Width + (1u << 4) | // 1 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } else { BK4819_WriteRegister(BK4819_REG_43, - (0u << 15) | // 0 - (2u << 12) | // 4 RF filter bandwidth - (0u << 9) | // 0 RF filter bandwidth when signal is weak - (1u << 6) | // 1 AFTxLPF2 filter Band Width - (1u << 4) | // 1 BW Mode Selection - (1u << 3) | // 1 - (0u << 2) | // 0 Gain after FM Demodulation - (0u << 0)); // 0 + (0u << 15) | // 0 + (2u << 12) | // 4 RF filter bandwidth + (0u << 9) | // 0 RF filter bandwidth when signal is weak + (1u << 6) | // 1 AFTxLPF2 filter Band Width + (1u << 4) | // 1 BW Mode Selection + (1u << 3) | // 1 + (0u << 2) | // 0 Gain after FM Demodulation + (0u << 0)); // 0 } } } diff --git a/firmware.bin b/firmware.bin index 013a291aa1aae2937e89503c74ceda4f6dcd9fbd..900007beda87c0a583436538e466e7618b0321d1 100644 GIT binary patch delta 47 zcmcaJpZU&w<_#4BtSihJ7*=eq6}Y%lG{qt@HObV3my5yQ)h%2X!rh#Fs*)7|r3Da~ delta 47 zcmcaJpZU&w<_#4BtS`(N7+!3y6}Y%lG|4hC$;i-zmy5yQ)h%2X!rh#Fs*)7|uq67$p8QV diff --git a/ui/menu.c b/ui/menu.c index 421e8a0..2c18142 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -40,7 +40,7 @@ // const t_menu_item MenuList[] = { -// name, voice ID, menu ID +// text, voice ID, menu ID {"SQL", VOICE_ID_SQUELCH, MENU_SQL }, {"STEP", VOICE_ID_FREQUENCY_STEP, MENU_STEP }, @@ -86,7 +86,7 @@ const t_menu_item MenuList[] = {"SLIST1", VOICE_ID_INVALID, MENU_SLIST1 }, {"SLIST2", VOICE_ID_INVALID, MENU_SLIST2 }, #ifdef ENABLE_ALARM - "AL-MOD", VOICE_ID_INVALID, MENU_AL_MOD }, + {"AL-MOD", VOICE_ID_INVALID, MENU_AL_MOD }, #endif {"ANI-ID", VOICE_ID_ANI_CODE, MENU_ANI_ID }, {"UPCODE", VOICE_ID_INVALID, MENU_UPCODE },