0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00

Various updates

This commit is contained in:
OneOfEleven
2023-09-12 11:01:34 +01:00
parent e43dfb3f6b
commit 1ea5470254
13 changed files with 233 additions and 238 deletions

39
radio.c
View File

@ -258,6 +258,12 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
Tmp = Data[0];
switch (gEeprom.VfoInfo[VFO].ConfigRX.CodeType)
{
default:
case CODE_TYPE_OFF:
gEeprom.VfoInfo[VFO].ConfigRX.CodeType = CODE_TYPE_OFF;
Tmp = 0;
break;
case CODE_TYPE_CONTINUOUS_TONE:
if (Tmp >= 50)
Tmp = 0;
@ -268,11 +274,6 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
if (Tmp >= 104)
Tmp = 0;
break;
default:
gEeprom.VfoInfo[VFO].ConfigRX.CodeType = CODE_TYPE_OFF;
Tmp = 0;
break;
}
gEeprom.VfoInfo[VFO].ConfigRX.Code = Tmp;
@ -342,7 +343,6 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
Frequency = pRadio->ConfigRX.Frequency;
// TODO: FIX-ME !!!
if (Frequency < gLowerLimitFrequencyBandTable[Band])
Frequency = gLowerLimitFrequencyBandTable[Band];
else
@ -585,6 +585,16 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
switch (CodeType)
{
default:
case CODE_TYPE_OFF:
BK4819_SetCTCSSFrequency(670);
BK4819_Set55HzTailDetection();
InterruptMask = 0
| BK4819_REG_3F_CxCSS_TAIL
| BK4819_REG_3F_SQUELCH_FOUND
| BK4819_REG_3F_SQUELCH_LOST;
break;
case CODE_TYPE_DIGITAL:
case CODE_TYPE_REVERSE_DIGITAL:
BK4819_SetCDCSSCodeWord(DCS_GetGolayCodeWord(CodeType, Code));
@ -606,15 +616,6 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
| BK4819_REG_3F_SQUELCH_FOUND
| BK4819_REG_3F_SQUELCH_LOST;
break;
default:
BK4819_SetCTCSSFrequency(670);
BK4819_Set55HzTailDetection();
InterruptMask = 0
| BK4819_REG_3F_CxCSS_TAIL
| BK4819_REG_3F_SQUELCH_FOUND
| BK4819_REG_3F_SQUELCH_LOST;
break;
}
if (gRxVfo->SCRAMBLING_TYPE == 0 || !gSetting_ScrambleEnable)
@ -773,9 +774,9 @@ void RADIO_SetVfoState(VfoState_t State)
}
else
{
if (State == VFO_STATE_VOL_HIGH)
if (State == VFO_STATE_VOLTAGE_HIGH)
{
VfoState[0] = VFO_STATE_VOL_HIGH;
VfoState[0] = VFO_STATE_VOLTAGE_HIGH;
VfoState[1] = VFO_STATE_TX_DISABLE;
}
else
@ -827,8 +828,8 @@ void RADIO_PrepareTX(void)
if (gBatteryDisplayLevel == 0)
State = VFO_STATE_BAT_LOW;
else
if (gBatteryDisplayLevel == 6)
State = VFO_STATE_VOL_HIGH;
if (gBatteryDisplayLevel >= 6)
State = VFO_STATE_VOLTAGE_HIGH;
else
goto Skip;
}