oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-06 23:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix DN mode bugs and rename DTMF methods.

Browse source
This commit is contained in:
Jonathan Naylor 2017-08-16 14:57:50 +01:00
parent 11d56992be
commit 6a81990b48
3 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

44
YSFGateway/DTMF.cpp
View file

@ -54,14 +54,14 @@ CDTMF::~CDTMF()
{
}
WX_STATUS CDTMF::decodeVW(const unsigned char* payload)
WX_STATUS CDTMF::decodeVoiceFRMode(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);
WX_STATUS status = decodeVoiceFRModeSlice(payload + offset);
if (status != WXS_NONE)
return status;
}
@ -69,29 +69,14 @@ WX_STATUS CDTMF::decodeVW(const unsigned char* payload)
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)
WX_STATUS CDTMF::decodeVDMode1(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);
WX_STATUS status = decodeVDMode1Slice(payload + offset);
if (status != WXS_NONE)
return status;
}
@ -99,7 +84,22 @@ WX_STATUS CDTMF::decodeDN2(const unsigned char* payload)
return WXS_NONE;
}
WX_STATUS CDTMF::decodeVWSlice(const unsigned char* ambe)
WX_STATUS CDTMF::decodeVDMode2(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 = decodeVDMode2Slice(payload + offset);
if (status != WXS_NONE)
return status;
}
return WXS_NONE;
}
WX_STATUS CDTMF::decodeVoiceFRModeSlice(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] &&
@ -177,7 +177,7 @@ WX_STATUS CDTMF::decodeVWSlice(const unsigned char* ambe)
}
}
WX_STATUS CDTMF::decodeDN1Slice(const unsigned char* ambe)
WX_STATUS CDTMF::decodeVDMode1Slice(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] &&
@ -255,7 +255,7 @@ WX_STATUS CDTMF::decodeDN1Slice(const unsigned char* ambe)
}
}
WX_STATUS CDTMF::decodeDN2Slice(const unsigned char* ambe)
WX_STATUS CDTMF::decodeVDMode2Slice(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] &&