Possible DW AM TX fix

This commit is contained in:
OneOfEleven 2023-10-01 19:56:04 +01:00
parent c644b30b2f
commit 8caff25b7c
8 changed files with 9 additions and 14 deletions

View File

@ -5,10 +5,10 @@
# #
ENABLE_SWD := 0 ENABLE_SWD := 0
ENABLE_OVERLAY := 0 ENABLE_OVERLAY := 0
ENABLE_LTO := 0 ENABLE_LTO := 1
ENABLE_UART := 1 ENABLE_UART := 1
ENABLE_AIRCOPY := 0 ENABLE_AIRCOPY := 0
ENABLE_FMRADIO := 1 ENABLE_FMRADIO := 0
ENABLE_NOAA := 0 ENABLE_NOAA := 0
ENABLE_VOICE := 0 ENABLE_VOICE := 0
ENABLE_ALARM := 0 ENABLE_ALARM := 0
@ -21,7 +21,7 @@ ENABLE_TX_WHEN_AM := 0
ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
ENABLE_MAIN_KEY_HOLD := 1 ENABLE_MAIN_KEY_HOLD := 1
ENABLE_BOOT_BEEPS := 0 ENABLE_BOOT_BEEPS := 0
ENABLE_COMPANDER := 1 ENABLE_COMPANDER := 0
ENABLE_SHOW_CHARGE_LEVEL := 0 ENABLE_SHOW_CHARGE_LEVEL := 0
ENABLE_REVERSE_BAT_SYMBOL := 1 ENABLE_REVERSE_BAT_SYMBOL := 1
ENABLE_CODE_SCAN_TIMEOUT := 0 ENABLE_CODE_SCAN_TIMEOUT := 0

View File

@ -438,7 +438,7 @@ const uint8_t orig_pga = 6; // -3dB
} }
} }
if (diff_dB >= -3) // 3dB hysterisis (help reduce gain hunting) if (diff_dB >= -6) // 6dB hysterisis (help reduce gain hunting)
hold_counter[vfo] = 30; // 300ms hold hold_counter[vfo] = 30; // 300ms hold
if (hold_counter[vfo] == 0) if (hold_counter[vfo] == 0)

Binary file not shown.

Binary file not shown.

2
misc.c
View File

@ -193,7 +193,7 @@ uint8_t gRestoreMrChannel;
uint8_t gCurrentScanList; uint8_t gCurrentScanList;
uint8_t gPreviousMrChannel; uint8_t gPreviousMrChannel;
uint32_t gRestoreFrequency; uint32_t gRestoreFrequency;
uint8_t gRxVfoIsActive; bool gRxVfoIsActive;
#ifdef ENABLE_ALARM #ifdef ENABLE_ALARM
uint8_t gAlarmToneCounter; uint8_t gAlarmToneCounter;
uint16_t gAlarmRunningCounter; uint16_t gAlarmRunningCounter;

2
misc.h
View File

@ -257,7 +257,7 @@ extern uint8_t gRestoreMrChannel;
extern uint8_t gCurrentScanList; extern uint8_t gCurrentScanList;
extern uint8_t gPreviousMrChannel; extern uint8_t gPreviousMrChannel;
extern uint32_t gRestoreFrequency; extern uint32_t gRestoreFrequency;
extern uint8_t gRxVfoIsActive; extern bool gRxVfoIsActive;
extern uint8_t gAlarmToneCounter; extern uint8_t gAlarmToneCounter;
extern uint16_t gAlarmRunningCounter; extern uint16_t gAlarmRunningCounter;
extern bool gKeyBeingHeld; extern bool gKeyBeingHeld;

View File

@ -915,7 +915,7 @@ void RADIO_PrepareTX(void)
gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms; gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms;
gScheduleDualWatch = false; gScheduleDualWatch = false;
if (gRxVfoIsActive) if (!gRxVfoIsActive)
{ // use the TX vfo { // use the TX vfo
gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL; gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL;
gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL]; gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
@ -954,8 +954,7 @@ void RADIO_PrepareTX(void)
} }
else else
//if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0 || gCurrentVfo->CHANNEL_SAVE <= FREQ_CHANNEL_LAST) //if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0 || gCurrentVfo->CHANNEL_SAVE <= FREQ_CHANNEL_LAST)
//if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0) if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0)
if (TX_freq_check(gEeprom.VfoInfo[gEeprom.TX_CHANNEL].pTX->Frequency) == 0)
{ // TX frequency is allowed { // TX frequency is allowed
if (gCurrentVfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE) if (gCurrentVfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE)
State = VFO_STATE_BUSY; // busy RX'ing a station State = VFO_STATE_BUSY; // busy RX'ing a station

View File

@ -420,11 +420,7 @@ void UI_DisplayMenu(void)
{ // current menu item { // current menu item
strcpy(String, MenuList[menu_index].name); strcpy(String, MenuList[menu_index].name);
// strcat(String, ":"); // strcat(String, ":");
UI_PrintStringSmall(String, 0, 0, 6); UI_PrintStringSmall(String, 0, 0, 0);
// invert pixels
// for (i = 0; i < (7 * strlen(String)); i++)
// gFrameBuffer[6][i] ^= 0xFF;
} }
} }
#endif #endif