mirrors/uv-k5-firmware-custom
1
0
Fork 0
mirror of https://github.com/egzumer/uv-k5-firmware-custom synced 2024-11-21 17:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
OneOfEleven 2023-09-12 11:49:16 +01:00
parent 1ea5470254
commit 08658f8b82
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/dtmf.c
View File

@ -55,7 +55,7 @@ bool gDTMF_IsGroupCall;
bool DTMF_ValidateCodes(char *pCode, uint8_t Size)
{
uint8_t i;
unsigned int i;
if (pCode[0] == 0xFF || pCode[0] == 0)
return false;
@ -75,19 +75,26 @@ bool DTMF_ValidateCodes(char *pCode, uint8_t Size)
return true;
}
bool DTMF_GetContact(uint8_t Index, char *pContact)
bool DTMF_GetContact(const int Index, char *pContact)
{
EEPROM_ReadBuffer(0x1C00 + (Index * 16), pContact, 16);
return ((pContact[0] - ' ') >= 0x5F) ? false : true;
int i = -1;
if (Index >= 0 && Index < 16 && pContact != NULL) // max 16 DTMF contacts
{
EEPROM_ReadBuffer(0x1C00 + (Index * 16), pContact, 16);
i = (int)pContact[0] - ' ';
}
return (i < 0 || i >= 95) ? false : true;
}
bool DTMF_FindContact(const char *pContact, char *pResult)
{
char Contact [16];
uint8_t i, j;
unsigned int i;
for (i = 0; i < 16; i++)
{
unsigned int j;
if (!DTMF_GetContact(i, Contact))
return false;
@ -139,7 +146,7 @@ char DTMF_GetCharacter(uint8_t Code)
bool DTMF_CompareMessage(const char *pMsg, const char *pTemplate, uint8_t Size, bool bCheckGroup)
{
uint8_t i;
unsigned int i;
for (i = 0; i < Size; i++)
{

2
app/dtmf.h
View File

@ -77,7 +77,7 @@ extern bool gDTMF_IsTx;
extern uint8_t gDTMF_TxStopCountdown;
bool DTMF_ValidateCodes(char *pCode, uint8_t Size);
bool DTMF_GetContact(uint8_t Index, char *pContact);
bool DTMF_GetContact(const int Index, char *pContact);
bool DTMF_FindContact(const char *pContact, char *pResult);
char DTMF_GetCharacter(uint8_t Code);
bool DTMF_CompareMessage(const char *pDTMF, const char *pTemplate, uint8_t Size, bool bFlag);

BIN
firmware
View File

Binary file not shown.

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

5
ui/menu.c
View File

@ -509,10 +509,9 @@ void UI_DisplayMenu(void)
break;
case MENU_D_LIST:
gIsDtmfContactValid = DTMF_GetContact((uint8_t)gSubMenuSelection - 1, Contact);
gIsDtmfContactValid = DTMF_GetContact((int)gSubMenuSelection - 1, Contact);
if (!gIsDtmfContactValid)
// Ghidra being weird again...
memcpy(String, "NULL\0\0\0", 8);
strcpy(String, "NULL");
else
memcpy(String, Contact, 8);
break;