diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index 201e1b89..c72e7ff9 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -150,7 +150,6 @@ enable_feature(ENABLE_SMALL_BOLD) enable_feature(ENABLE_CUSTOM_MENU_LAYOUT) enable_feature(ENABLE_KEEP_MEM_NAME) enable_feature(ENABLE_WIDE_RX) -enable_feature(ENABLE_TX_WHEN_AM) enable_feature(ENABLE_F_CAL_MENU) enable_feature(ENABLE_CTCSS_TAIL_PHASE_SHIFT) enable_feature(ENABLE_BOOT_BEEPS) diff --git a/App/app/foxhunt.c b/App/app/foxhunt.c index 1563e8da..f7ca6596 100644 --- a/App/app/foxhunt.c +++ b/App/app/foxhunt.c @@ -841,10 +841,8 @@ static VfoState_t FOXHUNT_TxState(void) return VFO_STATE_BAT_LOW; if (gBatteryDisplayLevel > 6) return VFO_STATE_VOLTAGE_HIGH; -#ifndef ENABLE_TX_WHEN_AM if (gTxVfo->Modulation != MODULATION_FM) return VFO_STATE_TX_DISABLE; -#endif return VFO_STATE_NORMAL; } diff --git a/App/radio.c b/App/radio.c index 6fe4974b..69cc6bf7 100644 --- a/App/radio.c +++ b/App/radio.c @@ -1213,12 +1213,10 @@ void RADIO_PrepareTX(void) State = VFO_STATE_TX_DISABLE; } #endif -#ifndef ENABLE_TX_WHEN_AM else if (gCurrentVfo->Modulation != MODULATION_FM) { - // not allowed to TX if in AM mode + // AM and other non-FM modes are receive-only. State = VFO_STATE_TX_DISABLE; } -#endif if (State != VFO_STATE_NORMAL) { // TX not allowed diff --git a/CMakePresets.json b/CMakePresets.json index 8f36208a..9a8e4caa 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -39,7 +39,6 @@ "ENABLE_CUSTOM_MENU_LAYOUT": true, "ENABLE_KEEP_MEM_NAME": true, "ENABLE_WIDE_RX": true, - "ENABLE_TX_WHEN_AM": false, "ENABLE_F_CAL_MENU": false, "ENABLE_CTCSS_TAIL_PHASE_SHIFT": false, "ENABLE_BOOT_BEEPS": false,