From 9ebe5b4e56ad349e3c89c59a25e1970248910eac Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Mon, 11 Sep 2023 08:45:29 +0100 Subject: [PATCH] TX disabled when radio set to 'AM' - compile option --- Makefile | 7 ++--- README.md | 11 ++++---- firmware | Bin 172708 -> 172708 bytes firmware.bin | Bin 56808 -> 56816 bytes firmware.packed.bin | Bin 56826 -> 56834 bytes frequencies.c | 64 ++++++++++++++++++++++++++------------------ radio.c | 9 ++++++- scheduler.c | 18 ------------- ui/main.c | 4 +-- 9 files changed, 58 insertions(+), 55 deletions(-) diff --git a/Makefile b/Makefile index 75fd7e7..65b6a5e 100644 --- a/Makefile +++ b/Makefile @@ -93,14 +93,15 @@ LDFLAGS = -mcpu=cortex-m0 -nostartfiles -Wl,-T,firmware.ld #LDFLAGS = -mcpu=cortex-m0 -nostartfiles -Wl,-gc-sections,-T,firmware.ld # compilation options -#CFLAGS += -DBIG_FREQ_FONT +CFLAGS += -DDISABLE_BIG_FREQ CFLAGS += -DDISABLE_NOAA CFLAGS += -DDISABLE_VOICE CFLAGS += -DDISABLE_AIRCOPY -CFLAGS += -DKEEP_MEM_NAME CFLAGS += -DDISABLE_ALARM +CFLAGS += -DKEEP_MEM_NAME CFLAGS += -DCHAN_NAME_FREQ -CFLAGS += -DSINGLE_VFO_CHAN +#CFLAGS += -DENABLE_TX_WHEN_AM +#CFLAGS += -DSINGLE_VFO_CHAN #CFLAGS += -DBAND_SCOPE ifeq ($(DEBUG),1) diff --git a/README.md b/README.md index 40dba20..da45a8f 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,14 @@ Am amazing achievement if you ask me ! This version you can customize at compile time by making various changes to the makefile. You can edit those changes by (currently) editing the MakeFile, look for these lines .. -* CFLAGS += -DBIG_FREQ_FONT .. show frequency using big font +* CFLAGS += -DDISABLE_BIG_FREQ .. show frequencies using smaller font * CFLAGS += -DDISABLE_NOAA .. remove NOAA channels option from the firmware * CFLAGS += -DDISABLE_VOICE .. remove spoken VOICES option from the firmware * CFLAGS += -DDISABLE_AIRCOPY .. remove AIRCOPY option -* CFLAGS += -DKEEP_MEM_NAME .. keep the memory channels name when re-saving a channel * CFLAGS += -DDISABLE_ALARM .. remove the ALARM transmit option from the firmware +* CFLAGS += -DKEEP_MEM_NAME .. keep the memory channels name when re-saving a channel * CFLAGS += -DCHAN_NAME_FREQ .. show the channel frequency (as well as channel number/name) +* #CFLAGS += -DENABLE_TX_WHEN_AM .. enable TX when radio set to AM (radio does NOT do AM, the adverts are false) * #CFLAGS += -DSINGLE_VFO_CHAN .. (not yet implemented) show a single VFO/CHANNEL if dual-watch/cross-band are disabled * #CFLAGS += -DBAND_SCOPE .. (not yet implemented) show a band scope (spectrum/panadapter) @@ -37,11 +38,11 @@ To enable the custom option just uncomment the line by removing the starting '#' * "TXP" menu, renamed to "TX-PWR" * "SAVE" menu, renamed to "B-SAVE" * "WX" menu, renamed to "CROS-B" - 'WX' normally means weather here in the UK -* "ABR" menu, renamed to "BAK-LT", shows extended backlight times, now has always ON option +* "ABR" menu, renamed to "BAK-LT", shows extended backlight times, includes always ON option * "SCR" menu, renamed to "SCRAM" -* "MIC" menu, shows mic gain in dB's, now includes the max mic gain possible (+15.5dB) +* "MIC" menu, shows mic gain in dB's, includes max mic gain possible (+15.5dB) * "VOL" menu, renamed to "BATVOL", shows voltage and percentage -* "AM" menu, renamed to "MODE", shows modulation mode +* "AM" menu, renamed to "MODE", shows RX modulation mode Menu renames are to try and reduce 'WTF does that do/mean ?' diff --git a/firmware b/firmware index 90c7dfbd9eb4a6ce8df91542f2f428d7a43b5c02..f9838594e3d94e416dee6b4cc181fafdcad76576 100644 GIT binary patch delta 7666 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 diff --git a/firmware.bin b/firmware.bin index d38606c63a4199fb5ae4ca1a64cdded06934ebb4..910742f332a6c9bbc6ccede6506660cde8d929a2 100644 GIT binary patch delta 3840 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

c3cqAZ*%DeHo7mR`! zZSaO2X!_$4k2mY!F-Ja1rBb4k+9#DVo_VC$qvh&}){d``iw^!!3 zLw!6a63|KuRKVMDeUJXLNSh06hS>>d2gs$Lf!o+oscxA aZbYhm>>l6`7s?(`D(8Q*FD?9PqwYV{od6jC diff --git a/firmware.packed.bin b/firmware.packed.bin index 00bc2ff3348e1535c7ce86561f99b3c7d3f1ecd3..cee9d47e9122abc02d6f6bcc5c55adab3ee861e3 100644 GIT binary patch delta 17028 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 diff --git a/frequencies.c b/frequencies.c index 3389741..b04cc26 100644 --- a/frequencies.c +++ b/frequencies.c @@ -26,7 +26,7 @@ const uint32_t LowerLimitFrequencyBandTable[7] = 17400000, 35000000, 40000000, - 47000000, + 47000000 }; const uint32_t MiddleFrequencyBandTable[7] = @@ -37,7 +37,7 @@ const uint32_t MiddleFrequencyBandTable[7] = 26000000, 37000000, 43500000, - 55000000, + 55000000 }; const uint32_t UpperLimitFrequencyBandTable[7] = @@ -48,7 +48,7 @@ const uint32_t UpperLimitFrequencyBandTable[7] = 34999990, 39999990, 46999990, - 60000000, + 60000000 }; #ifndef DISABLE_NOAA @@ -63,19 +63,31 @@ const uint32_t UpperLimitFrequencyBandTable[7] = 16252500, 16152500, 16177500, - 16327500, + 16327500 }; #endif -const uint16_t StepFrequencyTable[6] = -{ - 250, - 500, - 625, - 1000, - 1250, - 2500 -}; +#if 0 + const uint16_t StepFrequencyTable[6] = + { + 250, + 500, + 625, + 1000, + 1250, + 2500 + }; +#else + const uint16_t StepFrequencyTable[6] = + { + 125, + 250, + 625, + 1000, + 1250, + 2500 + }; +#endif FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency) { @@ -135,47 +147,47 @@ int FREQUENCY_Check(VFO_Info_t *pInfo) switch (gSetting_F_LOCK) { case F_LOCK_FCC: - if (Frequency >= 14400000 && Frequency <= 14799990) + if (Frequency >= 14400000 && Frequency < 14800000) return 0; - if (Frequency >= 42000000 && Frequency <= 44999990) + if (Frequency >= 42000000 && Frequency < 45000000) return 0; break; case F_LOCK_CE: - if (Frequency >= 14400000 && Frequency <= 14599990) + if (Frequency >= 14400000 && Frequency < 14600000) return 0; break; case F_LOCK_GB: - if (Frequency >= 14400000 && Frequency <= 14799990) + if (Frequency >= 14400000 && Frequency < 14800000) return 0; - if (Frequency >= 43000000 && Frequency <= 43999990) + if (Frequency >= 43000000 && Frequency < 44000000) return 0; break; case F_LOCK_430: - if (Frequency >= 13600000 && Frequency <= 17399990) + if (Frequency >= 13600000 && Frequency < 17400000) return 0; - if (Frequency >= 40000000 && Frequency <= 42999990) + if (Frequency >= 40000000 && Frequency < 43000000) return 0; break; case F_LOCK_438: - if (Frequency >= 13600000 && Frequency <= 17399990) + if (Frequency >= 13600000 && Frequency < 17400000) return 0; - if (Frequency >= 40000000 && Frequency <= 43799990) + if (Frequency >= 40000000 && Frequency < 43800000) return 0; break; default: - if (Frequency >= 13600000 && Frequency <= 17399990) + if (Frequency >= 13600000 && Frequency < 17400000) return 0; - if (Frequency >= 35000000 && Frequency <= 39999990) + if (Frequency >= 35000000 && Frequency < 40000000) if (gSetting_350TX && gSetting_350EN) return 0; - if (Frequency >= 40000000 && Frequency <= 46999990) + if (Frequency >= 40000000 && Frequency < 47000000) return 0; - if (Frequency >= 17400000 && Frequency <= 34999990) + if (Frequency >= 17400000 && Frequency < 35000000) if (gSetting_200TX) return 0; if (Frequency >= 47000000 && Frequency <= 60000000) diff --git a/radio.c b/radio.c index fb64565..38f8a70 100644 --- a/radio.c +++ b/radio.c @@ -812,6 +812,13 @@ void RADIO_PrepareTX(void) { VfoState_t State; + #ifndef ENABLE_TX_WHEN_AM + // disable the TX when VFO/Channel is set to AM + // the radio does NOT do AM, the adverts are false + if (gCurrentVfo->IsAM) + State = VFO_STATE_TX_DISABLE; + else + #endif if (!FREQUENCY_Check(gCurrentVfo)) { if (gCurrentVfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE) @@ -827,7 +834,7 @@ void RADIO_PrepareTX(void) } else State = VFO_STATE_TX_DISABLE; - + RADIO_SetVfoState(State); #ifndef DISABLE_ALARM diff --git a/scheduler.c b/scheduler.c index 089e65b..71eee11 100644 --- a/scheduler.c +++ b/scheduler.c @@ -98,22 +98,4 @@ void SystickHandler(void) if (gVoxStopCountdown) gVoxStopCountdown--; - - #if 0 - if (gCurrentFunction == FUNCTION_TRANSMIT || gBacklightCountdown > 0) - { - GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight ON - } - else - if (gEeprom.BACKLIGHT >= 5) - { // backlight ON - half brightness - // was hoping to use this but don't like the odd flicker - if (gGlobalSysTickCounter & 1) - GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight ON - else - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight OFF - } - else - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight OFF - #endif } diff --git a/ui/main.c b/ui/main.c index 32a3f71..99042b0 100644 --- a/ui/main.c +++ b/ui/main.c @@ -267,7 +267,7 @@ void UI_DisplayMain(void) switch (gEeprom.CHANNEL_DISPLAY_MODE) { case MDF_FREQUENCY: // show the channel frequency - #ifdef BIG_FREQ_FONT + #ifndef DISABLE_BIG_FREQ NUMBER_ToDigits(frequency_Hz, String); // show the main large frequency digits UI_DisplayFrequency(String, 31, vfo_num * 4, false, false); @@ -329,7 +329,7 @@ void UI_DisplayMain(void) frequency_Hz = gEeprom.VfoInfo[vfo_num].pTX->Frequency; } - #ifdef BIG_FREQ_FONT + #ifndef DISABLE_BIG_FREQ NUMBER_ToDigits(frequency_Hz, String); // 8 digits // show the main large frequency digits UI_DisplayFrequency(String, 31, vfo_num * 4, false, false);