From 32daef5571995e59dd11ffe6adc4d5074515516b Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Sat, 29 Jun 2024 04:39:43 +0200 Subject: [PATCH] Add CA HAM and GMRS/FRS/MURS --- frequencies.c | 23 +++++++++++++++++++++++ settings.h | 4 ++++ ui/menu.c | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/frequencies.c b/frequencies.c index ff8a494..1798cf3 100644 --- a/frequencies.c +++ b/frequencies.c @@ -227,6 +227,29 @@ int32_t TX_freq_check(const uint32_t Frequency) if (Frequency >= 44600625 && Frequency <= 44619375) return 0; break; + + case F_LOCK_GMRS_FRS_MURS: + // https://forums.radioreference.com/threads/the-great-unofficial-radioreference-frs-gmrs-murs-fact-sheet.275370/ + if (Frequency >= 46256250 && Frequency <= 46271250) // FRS/GMRS + return 0; + if (Frequency >= 46756250 && Frequency <= 46771250) // FRS ONLY + return 0; + if (Frequency >= 46255000 && Frequency <= 46272500) // GMRS ONLY + return 0; + if (Frequency == 15182000 || + Frequency == 15188000 || + Frequency == 15194000 || + Frequency == 15457000 || + Frequency == 15460000) // MURS + return 0; + break; + + case F_LOCK_CA: + if (Frequency >= 14400000 && Frequency < 14800000) + return 0; + if (Frequency >= 43000000 && Frequency < 45000000) + return 0; + break; #endif case F_LOCK_ALL: diff --git a/settings.h b/settings.h index 3792af4..86e248e 100644 --- a/settings.h +++ b/settings.h @@ -41,12 +41,16 @@ typedef enum POWER_OnDisplayMode_t POWER_OnDisplayMode_t; enum TxLockModes_t { F_LOCK_DEF, //all default frequencies + configurable F_LOCK_FCC, +#ifdef ENABLE_FEAT_F4HWN_PMR + F_LOCK_CA, +#endif F_LOCK_CE, F_LOCK_GB, F_LOCK_430, F_LOCK_438, #ifdef ENABLE_FEAT_F4HWN_PMR F_LOCK_PMR, + F_LOCK_GMRS_FRS_MURS, #endif F_LOCK_ALL, // disable TX on all frequencies F_LOCK_NONE, // enable TX on all frequencies diff --git a/ui/menu.c b/ui/menu.c index f84a143..5d607dd 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -290,12 +290,16 @@ const char * const gSubMenu_F_LOCK[] = { "DEFAULT+\n137-174\n400-470", "FCC HAM\n144-148\n420-450", +#ifdef ENABLE_FEAT_F4HWN_PMR + "CA HAM\n144-148\n430-450", +#endif "CE HAM\n144-146\n430-440", "GB HAM\n144-148\n430-440", "137-174\n400-430", "137-174\n400-438", #ifdef ENABLE_FEAT_F4HWN_PMR "PMR 446", + "GMRS\nFRS\nMURS", #endif "DISABLE\nALL", "UNLOCK\nALL",