Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small updates and a timing improvement.

Browse source
This commit is contained in:
Jonathan Naylor 2016-02-19 06:21:40 +00:00
parent f0d63c31c3
commit ac82c4f6bc
4 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CRC.cpp
View file

@ -48,7 +48,7 @@ const uint8_t CRC8_TABLE[] = {
0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7, 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7,
0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83,
0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF,
0xFA, 0xFD, 0xF4, 0xF3, 0x01}; 0xFA, 0xFD, 0xF4, 0xF3, 0x01 };
const uint16_t CCITT16_TABLE1[] = { const uint16_t CCITT16_TABLE1[] = {
0x0000U, 0x1189U, 0x2312U, 0x329bU, 0x4624U, 0x57adU, 0x6536U, 0x74bfU, 0x0000U, 0x1189U, 0x2312U, 0x329bU, 0x4624U, 0x57adU, 0x6536U, 0x74bfU,
@ -166,6 +166,27 @@ unsigned char CCRC::encodeEightBit(const unsigned char *in, unsigned int length)
return crc; return crc;
} }
void CCRC::addCCITT162(unsigned char *in, unsigned int length)
{
assert(in != NULL);
assert(length > 2U);
union {
uint16_t crc16;
uint8_t crc8[2U];
};
crc16 = 0U;
for (unsigned i = 0U; i < (length - 2U); i++)
crc16 = (uint16_t(crc8[0U]) << 8) ^ CCITT16_TABLE2[crc8[1U] ^ in[i]];
crc16 = ~crc16;
in[length - 1U] = crc8[0U];
in[length - 2U] = crc8[1U];
}
bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length) bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length)
{ {
assert(in != NULL); assert(in != NULL);

1
CRC.h
View file

@ -26,6 +26,7 @@ public:
static void encodeFiveBit(const bool* in, unsigned int& tcrc); static void encodeFiveBit(const bool* in, unsigned int& tcrc);
static void addCCITT161(unsigned char* in, unsigned int length); static void addCCITT161(unsigned char* in, unsigned int length);
static void addCCITT162(unsigned char* in, unsigned int length);
static bool checkCCITT161(const unsigned char* in, unsigned int length); static bool checkCCITT161(const unsigned char* in, unsigned int length);
static bool checkCCITT162(const unsigned char* in, unsigned int length); static bool checkCCITT162(const unsigned char* in, unsigned int length);

5
MMDVMHost.cpp
View file

@ -326,19 +326,22 @@ int CMMDVMHost::run()
} }
unsigned int ms = stopWatch.elapsed(); unsigned int ms = stopWatch.elapsed();
stopWatch.start();
m_modem->clock(ms); m_modem->clock(ms);
m_modeTimer.clock(ms); m_modeTimer.clock(ms);
if (dstar != NULL) if (dstar != NULL)
dstar->clock(ms); dstar->clock(ms);
if (dmr != NULL) if (dmr != NULL)
dmr->clock(ms); dmr->clock(ms);
if (ysf != NULL) if (ysf != NULL)
ysf->clock(ms); ysf->clock(ms);
if (m_dstarNetwork != NULL) if (m_dstarNetwork != NULL)
m_dstarNetwork->clock(ms); m_dstarNetwork->clock(ms);
if (m_dmrNetwork != NULL) if (m_dmrNetwork != NULL)
m_dmrNetwork->clock(ms); m_dmrNetwork->clock(ms);
stopWatch.start();
dmrBeaconTimer.clock(ms); dmrBeaconTimer.clock(ms);
if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) { if (dmrBeaconTimer.isRunning() && dmrBeaconTimer.hasExpired()) {

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20160218"; const char* VERSION = "20160219";
#endif #endif