dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Handle multiple AMBE blocks per payload.

Browse source
This commit is contained in:
Jonathan Naylor 2017-08-16 10:18:43 +01:00
parent 356250df07
commit 11d56992be
2 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
YSFGateway/DTMF.cpp
View file

@ -54,7 +54,52 @@ CDTMF::~CDTMF()
{
}
WX_STATUS CDTMF::decodeVW(const unsigned char* ambe)
WX_STATUS CDTMF::decodeVW(const unsigned char* payload)
{
assert(payload != NULL);
payload += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES;
for (unsigned int offset = 0U; offset < 90U; offset += 18U) {
WX_STATUS status = decodeVWSlice(payload + offset);
if (status != WXS_NONE)
return status;
}
return WXS_NONE;
}
WX_STATUS CDTMF::decodeDN1(const unsigned char* payload)
{
assert(payload != NULL);
payload += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES;
for (unsigned int offset = 5U; offset < 90U; offset += 18U) {
WX_STATUS status = decodeDN1Slice(payload + offset);
if (status != WXS_NONE)
return status;
}
return WXS_NONE;
}
WX_STATUS CDTMF::decodeDN2(const unsigned char* payload)
{
assert(payload != NULL);
payload += YSF_SYNC_LENGTH_BYTES + YSF_FICH_LENGTH_BYTES;
for (unsigned int offset = 9U; offset < 90U; offset += 18U) {
WX_STATUS status = decodeDN2Slice(payload + offset);
if (status != WXS_NONE)
return status;
}
return WXS_NONE;
}
WX_STATUS CDTMF::decodeVWSlice(const unsigned char* ambe)
{
// DTMF begins with these byte values
if ((ambe[0] & DTMF_MASK[0]) == DTMF_SIG[0] && (ambe[1] & DTMF_MASK[1]) == DTMF_SIG[1] &&
@ -132,7 +177,7 @@ WX_STATUS CDTMF::decodeVW(const unsigned char* ambe)
}
}
WX_STATUS CDTMF::decodeDN1(const unsigned char* ambe)
WX_STATUS CDTMF::decodeDN1Slice(const unsigned char* ambe)
{
// DTMF begins with these byte values
if ((ambe[0] & DTMF_MASK[0]) == DTMF_SIG[0] && (ambe[1] & DTMF_MASK[1]) == DTMF_SIG[1] &&
@ -210,7 +255,7 @@ WX_STATUS CDTMF::decodeDN1(const unsigned char* ambe)
}
}
WX_STATUS CDTMF::decodeDN2(const unsigned char* ambe)
WX_STATUS CDTMF::decodeDN2Slice(const unsigned char* ambe)
{
// DTMF begins with these byte values
if ((ambe[0] & DTMF_MASK[0]) == DTMF_SIG[0] && (ambe[1] & DTMF_MASK[1]) == DTMF_SIG[1] &&

9
YSFGateway/DTMF.h
View file

@ -28,9 +28,9 @@ public:
CDTMF();
~CDTMF();
WX_STATUS decodeVW(const unsigned char* ambe);
WX_STATUS decodeDN1(const unsigned char* ambe);
WX_STATUS decodeDN2(const unsigned char* ambe);
WX_STATUS decodeVW(const unsigned char* payload);
WX_STATUS decodeDN1(const unsigned char* payload);
WX_STATUS decodeDN2(const unsigned char* payload);
std::string getReflector();
@ -44,6 +44,9 @@ private:
unsigned int m_pressCount;
char m_lastChar;
WX_STATUS decodeVWSlice(const unsigned char* ambe);
WX_STATUS decodeDN1Slice(const unsigned char* ambe);
WX_STATUS decodeDN2Slice(const unsigned char* ambe);
WX_STATUS validate() const;
};