mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00
Code Issues Releases Activity

DTMF decoder tidy up

Browse Source
This commit is contained in:
OneOfEleven
2023-09-17 04:58:27 +01:00
parent 079236f4aa
commit d1bbe69b91
12 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/app.c
View File

@ -646,31 +646,29 @@ void APP_CheckRadioInterrupts(void)
// g_CTCSS_Lost = true;
if (interrupt_status_bits & BK4819_REG_02_DTMF_5TONE_FOUND)
{
{ // save the new DTMF RX'ed character
// fetch the RX'ed char
const char c = DTMF_GetCharacter(BK4819_GetDTMF_5TONE_Code());
gDTMF_RequestPending = true;
gDTMF_RecvTimeout = DTMF_RX_timeout_500ms;
if (gDTMF_WriteIndex >= ARRAY_SIZE(gDTMF_Received))
{ // shift the RX buffer down one
unsigned int i;
for (i = 0; i < (ARRAY_SIZE(gDTMF_Received) - 1); i++)
gDTMF_Received[i] = gDTMF_Received[i + 1];
gDTMF_WriteIndex--;
}
// save new RX'ed character
gDTMF_Received[gDTMF_WriteIndex++] = DTMF_GetCharacter(BK4819_GetDTMF_5TONE_Code());
// shift the RX buffer down one - if need be
if (gDTMF_WriteIndex >= sizeof(gDTMF_Received))
memmove(gDTMF_Received, &gDTMF_Received[1], gDTMF_WriteIndex-- - 1);
gDTMF_Received[gDTMF_WriteIndex++] = c;
if (gCurrentFunction == FUNCTION_RECEIVE)
{
#ifdef ENABLE_DTMF_DECODER
if (gDTMF_WriteIndex > 0)
{
memcpy(gDTMF_ReceivedSaved, gDTMF_Received, sizeof(gDTMF_ReceivedSaved));
gDTMF_WriteIndexSaved = gDTMF_WriteIndex;
gDTMF_RecvTimeoutSaved = DTMF_RX_timeout_saved_500ms;
gUpdateDisplay = true;
}
gDTMF_RecvTimeoutSaved = DTMF_RX_timeout_saved_500ms;
size_t len = strlen(gDTMF_ReceivedSaved);
// shift the RX buffer down one
if (len >= (sizeof(gDTMF_ReceivedSaved) - 1))
memmove(gDTMF_ReceivedSaved, &gDTMF_ReceivedSaved[1], len--);
gDTMF_ReceivedSaved[len++] = c;
gDTMF_ReceivedSaved[len] = '\0';
gUpdateDisplay = true;
#endif
DTMF_HandleRequest();
@ -1718,8 +1716,7 @@ void APP_TimeSlice500ms(void)
{
if (--gDTMF_RecvTimeoutSaved == 0)
{
gDTMF_WriteIndexSaved = 0;
memset(gDTMF_ReceivedSaved, 0, sizeof(gDTMF_ReceivedSaved));
gDTMF_ReceivedSaved[0] = '\0';
gUpdateDisplay = true;
}
}
@ -1789,6 +1786,14 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
if (gEeprom.AUTO_KEYPAD_LOCK)
gKeyLockCountdown = 30; // 15 seconds
#ifdef ENABLE_DTMF_DECODER
if (Key == KEY_EXIT && bKeyPressed && bKeyHeld)
{ // clear the DTMF RX display buffer
gDTMF_RecvTimeoutSaved = 0;
gDTMF_ReceivedSaved[0] = '\0';
}
#endif
if (!bKeyPressed)
{
if (gFlagSaveVfo)

3
app/dtmf.c
View File

@ -40,8 +40,7 @@ uint8_t gDTMF_PreviousIndex = 0;
uint8_t gDTMF_RecvTimeout = 0;
#ifdef ENABLE_DTMF_DECODER
char gDTMF_ReceivedSaved[16];
uint8_t gDTMF_WriteIndexSaved = 0;
char gDTMF_ReceivedSaved[17];
uint8_t gDTMF_RecvTimeoutSaved = 0;
#endif

3
app/dtmf.h
View File

@ -62,8 +62,7 @@ extern uint8_t gDTMF_PreviousIndex;
extern uint8_t gDTMF_RecvTimeout;
#ifdef ENABLE_DTMF_DECODER
extern char gDTMF_ReceivedSaved[16];
extern uint8_t gDTMF_WriteIndexSaved;
extern char gDTMF_ReceivedSaved[17];
extern uint8_t gDTMF_RecvTimeoutSaved;
#endif