0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-08-03 09:36:32 +03:00

DTMF adjustments

This commit is contained in:
OneOfEleven
2023-09-18 00:48:40 +01:00
parent 66afde980a
commit 6cdd8f35b1
16 changed files with 278 additions and 111 deletions

View File

@@ -311,8 +311,7 @@ void DTMF_Reply(void)
pString = gDTMF_String;
}
else
{
// append out ID code onto the end of the DTMF code to send
{ // append our ID code onto the end of the DTMF code to send
sprintf(String, "%s%c%s", gDTMF_String, gEeprom.DTMF_SEPARATE_CODE, gEeprom.ANI_DTMF_ID);
pString = String;
}

View File

@@ -187,12 +187,16 @@ void GENERIC_Key_PTT(bool bKeyPressed)
gDTMF_InputBox[gDTMF_InputIndex] = 0;
#if 0
// append our DTMF ID to the inputted DTMF code -
// IF the user inputted code is exactly 3 digits long
if (gDTMF_InputIndex == 3)
gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3); // this will cause our ID tobe appened to the DTMF code
gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
else
#else
// append our DTMF ID to the inputted DTMF code -
// IF the user inputted code is exactly 3 digits long and D-DCD is enabled
if (gDTMF_InputIndex == 3 && gTxVfo->DTMF_DECODING_ENABLE > 0)
gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3); // this will cause our ID tobe appened to the DTMF code
gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
else
#endif
gDTMF_CallMode = DTMF_CALL_MODE_DTMF;

View File

@@ -175,6 +175,33 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
}
gRequestSaveVFO = true;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
#else
// TODO: FIX ME .. not working for VFO, works for channel
switch (gTxVfo->CHANNEL_BANDWIDTH)
{
case BANDWIDTH_WIDE:
gTxVfo->CHANNEL_BANDWIDTH = BANDWIDTH_NARROW;
break;
default:
case BANDWIDTH_NARROW:
gTxVfo->CHANNEL_BANDWIDTH = BANDWIDTH_WIDE;
break;
}
if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE))
{
gRequestSaveChannel = 2;
}
else
// if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
{
gRequestSaveVFO = true;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
}
BK4819_SetFilterBandwidth(gTxVfo->CHANNEL_BANDWIDTH);
gUpdateDisplay = true;
gRequestDisplayScreen = gScreenToDisplay;
#endif
break;