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

Merge guarded code. Simplify DTMF_CheckGroupCall

Browse Source
This commit is contained in:
Juan Antonio
2023-12-25 14:20:15 +01:00
committed by Krzysiek Egzmont
parent f35ce8d789
commit e5cff16d98
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dtmf.c
View File

@@ -212,12 +212,12 @@ static bool CompareMessage(const char *pMsg, const char *pTemplate, const unsign
DTMF_CallMode_t DTMF_CheckGroupCall(const char *pMsg, const unsigned int size) DTMF_CallMode_t DTMF_CheckGroupCall(const char *pMsg, const unsigned int size)
{ {
unsigned int i; for (unsigned int i = 0; i < size; i++)
for (i = 0; i < size; i++) if (pMsg[i] == gEeprom.DTMF_GROUP_CALL_CODE) {
if (pMsg[i] == gEeprom.DTMF_GROUP_CALL_CODE) return DTMF_CALL_MODE_GROUP;
break; }
return (i < size) ? DTMF_CALL_MODE_GROUP : DTMF_CALL_MODE_NOT_GROUP; return DTMF_CALL_MODE_NOT_GROUP;
} }
#endif #endif

24
app/dtmf.h
View File

@@ -78,7 +78,17 @@ extern uint8_t gDTMF_PreviousIndex;
extern char gDTMF_RX_live[20]; extern char gDTMF_RX_live[20];
extern uint8_t gDTMF_RX_live_timeout; extern uint8_t gDTMF_RX_live_timeout;
extern DTMF_ReplyState_t gDTMF_ReplyState;
bool DTMF_ValidateCodes(char *pCode, const unsigned int size);
char DTMF_GetCharacter(const unsigned int code);
void DTMF_clear_input_box(void);
void DTMF_Append(const char code);
void DTMF_Reply(void);
void DTMF_SendEndOfTransmission(void);
#ifdef ENABLE_DTMF_CALLING #ifdef ENABLE_DTMF_CALLING
extern char gDTMF_RX[17]; extern char gDTMF_RX[17];
extern uint8_t gDTMF_RX_index; extern uint8_t gDTMF_RX_index;
extern uint8_t gDTMF_RX_timeout; extern uint8_t gDTMF_RX_timeout;
@@ -97,23 +107,13 @@ extern DTMF_CallState_t gDTMF_CallState;
extern DTMF_CallMode_t gDTMF_CallMode; extern DTMF_CallMode_t gDTMF_CallMode;
extern bool gDTMF_IsTx; extern bool gDTMF_IsTx;
extern uint8_t gDTMF_TxStopCountdown_500ms; extern uint8_t gDTMF_TxStopCountdown_500ms;
#endif
extern DTMF_ReplyState_t gDTMF_ReplyState;
bool DTMF_ValidateCodes(char *pCode, const unsigned int size);
char DTMF_GetCharacter(const unsigned int code);
void DTMF_clear_input_box(void);
void DTMF_Append(const char vode);
void DTMF_Reply(void);
#ifdef ENABLE_DTMF_CALLING
void DTMF_clear_RX(void); void DTMF_clear_RX(void);
DTMF_CallMode_t DTMF_CheckGroupCall(const char *pDTMF, const unsigned int size); DTMF_CallMode_t DTMF_CheckGroupCall(const char *pDTMF, const unsigned int size);
bool DTMF_GetContact(const int Index, char *pContact); bool DTMF_GetContact(const int Index, char *pContact);
bool DTMF_FindContact(const char *pContact, char *pResult); bool DTMF_FindContact(const char *pContact, char *pResult);
void DTMF_HandleRequest(void); void DTMF_HandleRequest(void);
#endif
#endif
void DTMF_SendEndOfTransmission(void);
#endif #endif