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

Prepare for Wires-X encoding.

Browse source
This commit is contained in:
Jonathan Naylor 2016-06-06 18:19:56 +01:00
parent d9c0bb27c9
commit bbb7fc6c2c
12 changed files with 97 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

17
YSFGateway/YSFFICH.cpp
View file

@ -101,7 +101,7 @@ bool CYSFFICH::decode(const unsigned char* bytes)
m_fich[4U] = ((b2 << 4) & 0xF0U) | ((b3 >> 8) & 0x0FU);
m_fich[5U] = (b3 >> 0) & 0xFFU;
return CCRC::checkCCITT162(m_fich, 6U);
return CCRC::checkCCITT16(m_fich, 6U);
}
void CYSFFICH::encode(unsigned char* bytes)
@ -111,7 +111,7 @@ void CYSFFICH::encode(unsigned char* bytes)
// Skip the sync bytes
bytes += YSF_SYNC_LENGTH_BYTES;
CCRC::addCCITT162(m_fich, 6U);
CCRC::addCCITT16(m_fich, 6U);
unsigned int b0 = ((m_fich[0U] << 4) & 0xFF0U) | ((m_fich[1U] >> 4) & 0x00FU);
unsigned int b1 = ((m_fich[1U] << 8) & 0xF00U) | ((m_fich[2U] >> 0) & 0x0FFU);
@ -184,16 +184,9 @@ unsigned char CYSFFICH::getDT() const
return m_fich[2U] & 0x03U;
}
void CYSFFICH::setMR(unsigned char mr)
void CYSFFICH::load(const unsigned char* fich)
{
m_fich[2U] &= 0xC7U;
m_fich[2U] |= (mr << 3) & 0x38U;
}
assert(fich != NULL);
void CYSFFICH::setVoIP(bool on)
{
if (on)
m_fich[2U] |= 0x04U;
else
m_fich[2U] &= 0xFBU;
::memcpy(m_fich, fich, 4U);
}