From bbb7fc6c2c45dbfb631b999e4d7b4f8a469ec190 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 6 Jun 2016 18:19:56 +0100 Subject: [PATCH] Prepare for Wires-X encoding. --- YSFGateway/CRC.cpp | 137 ++------------------------ YSFGateway/CRC.h | 12 +-- YSFGateway/Conf.cpp | 18 +--- YSFGateway/Conf.h | 6 +- YSFGateway/Sync.cpp | 32 ++++++ YSFGateway/Sync.h | 30 ++++++ YSFGateway/YSFFICH.cpp | 17 +--- YSFGateway/YSFFICH.h | 3 +- YSFGateway/YSFGateway.ini | 3 +- YSFGateway/YSFGateway.vcxproj | 2 + YSFGateway/YSFGateway.vcxproj.filters | 6 ++ YSFGateway/YSFPayload.cpp | 8 +- 12 files changed, 97 insertions(+), 177 deletions(-) create mode 100644 YSFGateway/Sync.cpp create mode 100644 YSFGateway/Sync.h diff --git a/YSFGateway/CRC.cpp b/YSFGateway/CRC.cpp index c99ca6c..f2c3cbc 100644 --- a/YSFGateway/CRC.cpp +++ b/YSFGateway/CRC.cpp @@ -26,64 +26,6 @@ #include #include -const uint8_t CRC8_TABLE[] = { - 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, - 0x24, 0x23, 0x2A, 0x2D, 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, - 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, 0xE0, 0xE7, 0xEE, 0xE9, - 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD, - 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1, - 0xB4, 0xB3, 0xBA, 0xBD, 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2, - 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, 0xB7, 0xB0, 0xB9, 0xBE, - 0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A, - 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16, - 0x03, 0x04, 0x0D, 0x0A, 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42, - 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, 0x89, 0x8E, 0x87, 0x80, - 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4, - 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8, - 0xDD, 0xDA, 0xD3, 0xD4, 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C, - 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, 0x19, 0x1E, 0x17, 0x10, - 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34, - 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F, - 0x6A, 0x6D, 0x64, 0x63, 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B, - 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7, - 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, - 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, - 0xFA, 0xFD, 0xF4, 0xF3, 0x01 }; - -const uint16_t CCITT16_TABLE1[] = { - 0x0000U, 0x1189U, 0x2312U, 0x329bU, 0x4624U, 0x57adU, 0x6536U, 0x74bfU, - 0x8c48U, 0x9dc1U, 0xaf5aU, 0xbed3U, 0xca6cU, 0xdbe5U, 0xe97eU, 0xf8f7U, - 0x1081U, 0x0108U, 0x3393U, 0x221aU, 0x56a5U, 0x472cU, 0x75b7U, 0x643eU, - 0x9cc9U, 0x8d40U, 0xbfdbU, 0xae52U, 0xdaedU, 0xcb64U, 0xf9ffU, 0xe876U, - 0x2102U, 0x308bU, 0x0210U, 0x1399U, 0x6726U, 0x76afU, 0x4434U, 0x55bdU, - 0xad4aU, 0xbcc3U, 0x8e58U, 0x9fd1U, 0xeb6eU, 0xfae7U, 0xc87cU, 0xd9f5U, - 0x3183U, 0x200aU, 0x1291U, 0x0318U, 0x77a7U, 0x662eU, 0x54b5U, 0x453cU, - 0xbdcbU, 0xac42U, 0x9ed9U, 0x8f50U, 0xfbefU, 0xea66U, 0xd8fdU, 0xc974U, - 0x4204U, 0x538dU, 0x6116U, 0x709fU, 0x0420U, 0x15a9U, 0x2732U, 0x36bbU, - 0xce4cU, 0xdfc5U, 0xed5eU, 0xfcd7U, 0x8868U, 0x99e1U, 0xab7aU, 0xbaf3U, - 0x5285U, 0x430cU, 0x7197U, 0x601eU, 0x14a1U, 0x0528U, 0x37b3U, 0x263aU, - 0xdecdU, 0xcf44U, 0xfddfU, 0xec56U, 0x98e9U, 0x8960U, 0xbbfbU, 0xaa72U, - 0x6306U, 0x728fU, 0x4014U, 0x519dU, 0x2522U, 0x34abU, 0x0630U, 0x17b9U, - 0xef4eU, 0xfec7U, 0xcc5cU, 0xddd5U, 0xa96aU, 0xb8e3U, 0x8a78U, 0x9bf1U, - 0x7387U, 0x620eU, 0x5095U, 0x411cU, 0x35a3U, 0x242aU, 0x16b1U, 0x0738U, - 0xffcfU, 0xee46U, 0xdcddU, 0xcd54U, 0xb9ebU, 0xa862U, 0x9af9U, 0x8b70U, - 0x8408U, 0x9581U, 0xa71aU, 0xb693U, 0xc22cU, 0xd3a5U, 0xe13eU, 0xf0b7U, - 0x0840U, 0x19c9U, 0x2b52U, 0x3adbU, 0x4e64U, 0x5fedU, 0x6d76U, 0x7cffU, - 0x9489U, 0x8500U, 0xb79bU, 0xa612U, 0xd2adU, 0xc324U, 0xf1bfU, 0xe036U, - 0x18c1U, 0x0948U, 0x3bd3U, 0x2a5aU, 0x5ee5U, 0x4f6cU, 0x7df7U, 0x6c7eU, - 0xa50aU, 0xb483U, 0x8618U, 0x9791U, 0xe32eU, 0xf2a7U, 0xc03cU, 0xd1b5U, - 0x2942U, 0x38cbU, 0x0a50U, 0x1bd9U, 0x6f66U, 0x7eefU, 0x4c74U, 0x5dfdU, - 0xb58bU, 0xa402U, 0x9699U, 0x8710U, 0xf3afU, 0xe226U, 0xd0bdU, 0xc134U, - 0x39c3U, 0x284aU, 0x1ad1U, 0x0b58U, 0x7fe7U, 0x6e6eU, 0x5cf5U, 0x4d7cU, - 0xc60cU, 0xd785U, 0xe51eU, 0xf497U, 0x8028U, 0x91a1U, 0xa33aU, 0xb2b3U, - 0x4a44U, 0x5bcdU, 0x6956U, 0x78dfU, 0x0c60U, 0x1de9U, 0x2f72U, 0x3efbU, - 0xd68dU, 0xc704U, 0xf59fU, 0xe416U, 0x90a9U, 0x8120U, 0xb3bbU, 0xa232U, - 0x5ac5U, 0x4b4cU, 0x79d7U, 0x685eU, 0x1ce1U, 0x0d68U, 0x3ff3U, 0x2e7aU, - 0xe70eU, 0xf687U, 0xc41cU, 0xd595U, 0xa12aU, 0xb0a3U, 0x8238U, 0x93b1U, - 0x6b46U, 0x7acfU, 0x4854U, 0x59ddU, 0x2d62U, 0x3cebU, 0x0e70U, 0x1ff9U, - 0xf78fU, 0xe606U, 0xd49dU, 0xc514U, 0xb1abU, 0xa022U, 0x92b9U, 0x8330U, - 0x7bc7U, 0x6a4eU, 0x58d5U, 0x495cU, 0x3de3U, 0x2c6aU, 0x1ef1U, 0x0f78U }; - const uint16_t CCITT16_TABLE2[] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, @@ -119,33 +61,7 @@ const uint16_t CCITT16_TABLE2[] = { 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 }; -bool CCRC::checkFiveBit(bool* in, unsigned int tcrc) -{ - assert(in != NULL); - - unsigned int crc; - encodeFiveBit(in, crc); - - return crc == tcrc; -} - -void CCRC::encodeFiveBit(const bool* in, unsigned int& tcrc) -{ - assert(in != NULL); - - unsigned short total = 0U; - for (unsigned int i = 0U; i < 72U; i += 8U) { - unsigned char c; - CUtils::bitsToByteBE(in + i, c); - total += c; - } - - total %= 31U; - - tcrc = total; -} - -void CCRC::addCCITT162(unsigned char *in, unsigned int length) +void CCRC::addCCITT16(unsigned char *in, unsigned int length) { assert(in != NULL); assert(length > 2U); @@ -166,7 +82,7 @@ void CCRC::addCCITT162(unsigned char *in, unsigned int length) in[length - 2U] = crc8[1U]; } -bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length) +bool CCRC::checkCCITT16(const unsigned char *in, unsigned int length) { assert(in != NULL); assert(length > 2U); @@ -186,55 +102,14 @@ bool CCRC::checkCCITT162(const unsigned char *in, unsigned int length) return crc8[0U] == in[length - 1U] && crc8[1U] == in[length - 2U]; } -void CCRC::addCCITT161(unsigned char *in, unsigned int length) +unsigned char CCRC::addCRC(const unsigned char* in, unsigned int length) { assert(in != NULL); - assert(length > 2U); - union { - uint16_t crc16; - uint8_t crc8[2U]; - }; - - crc16 = 0xFFFFU; - - for (unsigned int i = 0U; i < (length - 2U); i++) - crc16 = uint16_t(crc8[1U]) ^ CCITT16_TABLE1[crc8[0U] ^ in[i]]; - - crc16 = ~crc16; - - in[length - 2U] = crc8[0U]; - in[length - 1U] = crc8[1U]; -} - -bool CCRC::checkCCITT161(const unsigned char *in, unsigned int length) -{ - assert(in != NULL); - assert(length > 2U); - - union { - uint16_t crc16; - uint8_t crc8[2U]; - }; - - crc16 = 0xFFFFU; - - for (unsigned int i = 0U; i < (length - 2U); i++) - crc16 = uint16_t(crc8[1U]) ^ CCITT16_TABLE1[crc8[0U] ^ in[i]]; - - crc16 = ~crc16; - - return crc8[0U] == in[length - 2U] && crc8[1U] == in[length - 1U]; -} - -unsigned char CCRC::crc8(const unsigned char *in, unsigned int length) -{ - assert(in != NULL); - - uint8_t crc = 0U; + unsigned char crc = 0U; for (unsigned int i = 0U; i < length; i++) - crc = CRC8_TABLE[crc ^ in[i]]; + crc += in[i]; return crc; -} +} \ No newline at end of file diff --git a/YSFGateway/CRC.h b/YSFGateway/CRC.h index e80c3f6..20482c8 100644 --- a/YSFGateway/CRC.h +++ b/YSFGateway/CRC.h @@ -22,16 +22,10 @@ class CCRC { public: - static bool checkFiveBit(bool* in, unsigned int tcrc); - static void encodeFiveBit(const bool* in, unsigned int& tcrc); + static void addCCITT16(unsigned char* in, unsigned int length); + static bool checkCCITT16(const 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 checkCCITT162(const unsigned char* in, unsigned int length); - - static unsigned char crc8(const unsigned char* in, unsigned int length); + static unsigned char addCRC(const unsigned char* in, unsigned int length); }; #endif diff --git a/YSFGateway/Conf.cpp b/YSFGateway/Conf.cpp index f587e38..006bf17 100644 --- a/YSFGateway/Conf.cpp +++ b/YSFGateway/Conf.cpp @@ -46,9 +46,8 @@ m_power(0U), m_latitude(0.0F), m_longitude(0.0F), m_height(0), -m_location(), +m_name(), m_description(), -m_url(), m_logDisplayLevel(0U), m_logFileLevel(0U), m_logFilePath(), @@ -128,12 +127,10 @@ bool CConf::read() m_longitude = float(::atof(value)); else if (::strcmp(key, "Height") == 0) m_height = ::atoi(value); - else if (::strcmp(key, "Location") == 0) - m_location = value; + else if (::strcmp(key, "Name") == 0) + m_name = value; else if (::strcmp(key, "Description") == 0) m_description = value; - else if (::strcmp(key, "URL") == 0) - m_url = value; } else if (section == SECTION_LOG) { if (::strcmp(key, "FilePath") == 0) m_logFilePath = value; @@ -214,9 +211,9 @@ int CConf::getHeight() const return m_height; } -std::string CConf::getLocation() const +std::string CConf::getName() const { - return m_location; + return m_name; } std::string CConf::getDescription() const @@ -224,11 +221,6 @@ std::string CConf::getDescription() const return m_description; } -std::string CConf::getURL() const -{ - return m_url; -} - unsigned int CConf::getLogDisplayLevel() const { return m_logDisplayLevel; diff --git a/YSFGateway/Conf.h b/YSFGateway/Conf.h index 6cf9e01..052b3d1 100644 --- a/YSFGateway/Conf.h +++ b/YSFGateway/Conf.h @@ -42,9 +42,8 @@ public: float getLatitude() const; float getLongitude() const; int getHeight() const; - std::string getLocation() const; + std::string getName() const; std::string getDescription() const; - std::string getURL() const; // The Log section unsigned int getLogDisplayLevel() const; @@ -76,9 +75,8 @@ private: float m_latitude; float m_longitude; int m_height; - std::string m_location; + std::string m_name; std::string m_description; - std::string m_url; unsigned int m_logDisplayLevel; unsigned int m_logFileLevel; diff --git a/YSFGateway/Sync.cpp b/YSFGateway/Sync.cpp new file mode 100644 index 0000000..c8d4d52 --- /dev/null +++ b/YSFGateway/Sync.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "Sync.h" + +#include "YSFDefines.h" + +#include +#include +#include + +void CSync::add(unsigned char* data) +{ + assert(data != NULL); + + ::memcpy(data, YSF_SYNC_BYTES, YSF_SYNC_LENGTH_BYTES); +} diff --git a/YSFGateway/Sync.h b/YSFGateway/Sync.h new file mode 100644 index 0000000..860ac65 --- /dev/null +++ b/YSFGateway/Sync.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#if !defined(SYNC_H) +#define SYNC_H + +class CSync +{ +public: + static void add(unsigned char* data); + +private: +}; + +#endif diff --git a/YSFGateway/YSFFICH.cpp b/YSFGateway/YSFFICH.cpp index bc90117..55c6a42 100644 --- a/YSFGateway/YSFFICH.cpp +++ b/YSFGateway/YSFFICH.cpp @@ -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); } diff --git a/YSFGateway/YSFFICH.h b/YSFGateway/YSFFICH.h index 33c35d0..d75b496 100644 --- a/YSFGateway/YSFFICH.h +++ b/YSFGateway/YSFFICH.h @@ -34,8 +34,7 @@ public: unsigned char getFT() const; unsigned char getDT() const; - void setMR(unsigned char mr); - void setVoIP(bool set); + void load(const unsigned char* fich); private: unsigned char* m_fich; diff --git a/YSFGateway/YSFGateway.ini b/YSFGateway/YSFGateway.ini index c312a9b..f3593ef 100644 --- a/YSFGateway/YSFGateway.ini +++ b/YSFGateway/YSFGateway.ini @@ -11,9 +11,8 @@ Power=1 Latitude=0.0 Longitude=0.0 Height=0 -Location=Nowhere +Name=Nowhere Description=Multi-Mode Repeater -URL=www.google.co.uk [Log] # Logging levels, 0=No logging diff --git a/YSFGateway/YSFGateway.vcxproj b/YSFGateway/YSFGateway.vcxproj index 095e9f8..f567fd3 100644 --- a/YSFGateway/YSFGateway.vcxproj +++ b/YSFGateway/YSFGateway.vcxproj @@ -156,6 +156,7 @@ + @@ -179,6 +180,7 @@ + diff --git a/YSFGateway/YSFGateway.vcxproj.filters b/YSFGateway/YSFGateway.vcxproj.filters index 2597eb5..c26c43a 100644 --- a/YSFGateway/YSFGateway.vcxproj.filters +++ b/YSFGateway/YSFGateway.vcxproj.filters @@ -77,6 +77,9 @@ Header Files + + Header Files + @@ -136,5 +139,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/YSFGateway/YSFPayload.cpp b/YSFGateway/YSFPayload.cpp index 2f16678..8b23e14 100644 --- a/YSFGateway/YSFPayload.cpp +++ b/YSFGateway/YSFPayload.cpp @@ -123,7 +123,7 @@ bool CYSFPayload::readVDMode1Data(const unsigned char* data, unsigned char* dt) unsigned char output[23U]; conv.chainback(output, 176U); - bool ret = CCRC::checkCCITT162(output, 22U); + bool ret = CCRC::checkCCITT16(output, 22U); if (ret) { for (unsigned int i = 0U; i < 20U; i++) output[i] ^= WHITENING_DATA[i]; @@ -168,7 +168,7 @@ bool CYSFPayload::readVDMode2Data(const unsigned char* data, unsigned char* dt) unsigned char output[13U]; conv.chainback(output, 96U); - bool ret = CCRC::checkCCITT162(output, 12U); + bool ret = CCRC::checkCCITT16(output, 12U); if (ret) { for (unsigned int i = 0U; i < 10U; i++) output[i] ^= WHITENING_DATA[i]; @@ -213,7 +213,7 @@ bool CYSFPayload::readDataFRModeData1(const unsigned char* data, unsigned char* unsigned char output[23U]; conv.chainback(output, 176U); - bool ret = CCRC::checkCCITT162(output, 22U); + bool ret = CCRC::checkCCITT16(output, 22U); if (ret) { for (unsigned int i = 0U; i < 20U; i++) output[i] ^= WHITENING_DATA[i]; @@ -258,7 +258,7 @@ bool CYSFPayload::readDataFRModeData2(const unsigned char* data, unsigned char* unsigned char output[23U]; conv.chainback(output, 176U); - bool ret = CCRC::checkCCITT162(output, 22U); + bool ret = CCRC::checkCCITT16(output, 22U); if (ret) { for (unsigned int i = 0U; i < 20U; i++) output[i] ^= WHITENING_DATA[i];