BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Don't send tail tone when STE is off

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-01-30 22:23:02 +01:00
parent 5da6183a69
commit c9b8476733
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/app.c
View File

@@ -1309,7 +1309,8 @@ void APP_TimeSlice10ms(void)
if (gAlarmState == ALARM_STATE_TXALARM) { if (gAlarmState == ALARM_STATE_TXALARM) {
gAlarmState = ALARM_STATE_SITE_ALARM; gAlarmState = ALARM_STATE_SITE_ALARM;
RADIO_EnableCxCSS(); if(gEeprom.TAIL_TONE_ELIMINATION)
RADIO_SendCssTail();
BK4819_SetupPowerAmplifier(0, 0); BK4819_SetupPowerAmplifier(0, 0);
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false);
BK4819_Enable_AfDac_DiscMode_TxDsp(); BK4819_Enable_AfDac_DiscMode_TxDsp();

10
driver/bk4819.c
View File

@@ -1395,18 +1395,16 @@ void BK4819_GenTail(uint8_t Tail)
} }
} }
void BK4819_EnableCDCSS(void) void BK4819_PlayCDCSSTail(void)
{ {
BK4819_GenTail(0); // CTC134 BK4819_GenTail(0); // CTC134
BK4819_WriteRegister(BK4819_REG_51, 0x804A); BK4819_WriteRegister(BK4819_REG_51, 0x804A); // 1 0 0 0 0 0 0 0 0 1001010
} }
void BK4819_EnableCTCSS(void) void BK4819_PlayCTCSSTail(void)
{ {
#ifdef ENABLE_CTCSS_TAIL_PHASE_SHIFT #ifdef ENABLE_CTCSS_TAIL_PHASE_SHIFT
//BK4819_GenTail(1); // 120° phase shift
BK4819_GenTail(2); // 180° phase shift BK4819_GenTail(2); // 180° phase shift
//BK4819_GenTail(3); // 240° phase shift
#else #else
BK4819_GenTail(4); // 55Hz tone freq BK4819_GenTail(4); // 55Hz tone freq
#endif #endif
@@ -1448,7 +1446,7 @@ void BK4819_EnableCTCSS(void)
// 0 = min // 0 = min
// 127 = max // 127 = max
BK4819_WriteRegister(BK4819_REG_51, 0x904A); // 1 0 0 1 0 0 0 0 0 1001010 BK4819_WriteRegister(BK4819_REG_51, 0x904A); // 1 0 0 1 0 0 0 0 0 1001010
} }
uint16_t BK4819_GetRSSI(void) uint16_t BK4819_GetRSSI(void)

4
driver/bk4819.h
View File

@@ -132,8 +132,8 @@ void BK4819_PlayDTMFString(const char *pString, bool bDelayFirst, uint16_t F
void BK4819_TransmitTone(bool bLocalLoopback, uint32_t Frequency); void BK4819_TransmitTone(bool bLocalLoopback, uint32_t Frequency);
void BK4819_GenTail(uint8_t Tail); void BK4819_GenTail(uint8_t Tail);
void BK4819_EnableCDCSS(void); void BK4819_PlayCDCSSTail(void);
void BK4819_EnableCTCSS(void); void BK4819_PlayCTCSSTail(void);
uint16_t BK4819_GetRSSI(void); uint16_t BK4819_GetRSSI(void);
int8_t BK4819_GetRxGain_dB(void); int8_t BK4819_GetRxGain_dB(void);

12
radio.c
View File

@@ -1067,15 +1067,15 @@ void RADIO_PrepareTX(void)
#endif #endif
} }
void RADIO_EnableCxCSS(void) void RADIO_SendCssTail(void)
{ {
switch (gCurrentVfo->pTX->CodeType) { switch (gCurrentVfo->pTX->CodeType) {
case CODE_TYPE_DIGITAL: case CODE_TYPE_DIGITAL:
case CODE_TYPE_REVERSE_DIGITAL: case CODE_TYPE_REVERSE_DIGITAL:
BK4819_EnableCDCSS(); BK4819_PlayCDCSSTail();
break; break;
default: default:
BK4819_EnableCTCSS(); BK4819_PlayCTCSSTail();
break; break;
} }
@@ -1088,7 +1088,8 @@ void RADIO_SendEndOfTransmission(void)
DTMF_SendEndOfTransmission(); DTMF_SendEndOfTransmission();
// send the CTCSS/DCS tail tone - allows the receivers to mute the usual FM squelch tail/crash // send the CTCSS/DCS tail tone - allows the receivers to mute the usual FM squelch tail/crash
RADIO_EnableCxCSS(); if(gEeprom.TAIL_TONE_ELIMINATION)
RADIO_SendCssTail();
RADIO_SetupRegisters(false); RADIO_SetupRegisters(false);
} }
@@ -1098,6 +1099,7 @@ void RADIO_PrepareCssTX(void)
SYSTEM_DelayMs(200); SYSTEM_DelayMs(200);
RADIO_EnableCxCSS(); if(gEeprom.TAIL_TONE_ELIMINATION)
RADIO_SendCssTail();
RADIO_SetupRegisters(true); RADIO_SetupRegisters(true);
} }

2
radio.h
View File

@@ -164,7 +164,7 @@ void RADIO_SetupAGC(bool listeningAM, bool disable);
void RADIO_SetModulation(ModulationMode_t modulation); void RADIO_SetModulation(ModulationMode_t modulation);
void RADIO_SetVfoState(VfoState_t State); void RADIO_SetVfoState(VfoState_t State);
void RADIO_PrepareTX(void); void RADIO_PrepareTX(void);
void RADIO_EnableCxCSS(void); void RADIO_SendCssTail(void);
void RADIO_PrepareCssTX(void); void RADIO_PrepareCssTX(void);
void RADIO_SendEndOfTransmission(void); void RADIO_SendEndOfTransmission(void);