From 34eb69dede792ed9e1fdd5a6308d424debaa5398 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 12 Nov 2018 09:48:00 +0000 Subject: [PATCH 01/15] Revert "Merge pull request #462 from gatekeep/master" This reverts commit a14a31657256bd82056cab2d4c60259eda898a0f, reversing changes made to f5a70aa6ceaf8edca9456029a8a1aded861ea0c5. --- P25Control.cpp | 27 +---- P25Data.cpp | 218 ++++--------------------------------- P25Data.h | 5 - P25Defines.h | 2 - RS241213.cpp | 283 +++++++++++++++---------------------------------- RS241213.h | 6 -- 6 files changed, 106 insertions(+), 435 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index bceff05..a424ee4 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -208,24 +208,9 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rssiCount++; } - if (duid == P25_DUID_HEADER) { + if (duid == P25_DUID_LDU1) { if (m_rfState == RS_RF_LISTENING) { m_rfData.reset(); - bool ret = m_rfData.decodeHeader(data + 2U); - if (!ret) { - m_lastDUID = duid; - return false; - } - - LogMessage("P25, received RF header"); - - m_lastDUID = duid; - return true; - } - } - else if (duid == P25_DUID_LDU1) { - if (m_rfState == RS_RF_LISTENING) { - //m_rfData.reset(); bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { m_lastDUID = duid; @@ -277,11 +262,6 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } if (m_rfState == RS_RF_AUDIO) { - bool ret = m_rfData.decodeLDU1(data + 2U); - if (!ret) { - return false; - } - // Regenerate Sync CSync::addP25Sync(data + 2U); @@ -326,11 +306,6 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } } else if (duid == P25_DUID_LDU2) { if (m_rfState == RS_RF_AUDIO) { - bool ret = m_rfData.decodeLDU2(data + 2U); - if (!ret) { - return false; - } - writeNetwork(m_rfLDU, m_lastDUID, false); // Regenerate Sync diff --git a/P25Data.cpp b/P25Data.cpp index e6378cd..618fdc2 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -22,13 +22,25 @@ #include "P25Utils.h" #include "CRC.h" #include "Hamming.h" -#include "Golay24128.h" #include "Utils.h" #include "Log.h" #include #include #include + +const unsigned char DUMMY_HEADER[] = { + 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, + 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x08U, 0xDCU, 0x60U, + 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U, 0x93U, 0xE7U, 0x73U, 0x77U, 0x57U, 0xD6U, 0xD3U, 0xCFU, 0x77U, + 0xEEU, 0x82U, 0x93U, 0xE2U, 0x2FU, 0xF3U, 0xD5U, 0xF5U, 0xBEU, 0xBCU, 0x54U, 0x0DU, 0x9CU, 0x29U, 0x3EU, 0x46U, + 0xE3U, 0x28U, 0xB0U, 0xB7U, 0x73U, 0x76U, 0x1EU, 0x26U, 0x0CU, 0x75U, 0x5BU, 0xF7U, 0x4DU, 0x5FU, 0x5AU, 0x37U, + 0x18U}; + +const unsigned char DUMMY_LDU2[] = { + 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0xACU, 0xB8U, 0xA4U, 0x9BU, + 0xDCU, 0x75U +}; const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U }; @@ -55,76 +67,11 @@ CP25Data::~CP25Data() delete[] m_mi; } -bool CP25Data::decodeHeader(const unsigned char* data) -{ - assert(data != NULL); - - // deinterleave - unsigned char rs[81U]; - unsigned char raw[81U]; - CP25Utils::decode(data, raw, 114U, 780U); - - // decode Golay (18,6,8) FEC - decodeHeaderGolay(raw, rs); - - // decode RS (36,20,17) FEC - try { - bool ret = m_rs241213.decode362017(rs); - if (!ret) - return false; - } catch (...) { - CUtils::dump(2U, "P25, RS crashed with input data", rs, 81U); - return false; - } - - m_mfId = rs[9U]; // Mfg Id. - m_algId = rs[10U]; // Algorithm ID - if (m_algId != P25_ALGO_UNENCRYPT) { - m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); - ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator - - m_kId = (rs[11U] << 8) + rs[12U]; // Key ID - } - else { - m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); - - m_kId = 0x0000U; - } - - return true; -} - void CP25Data::encodeHeader(unsigned char* data) { assert(data != NULL); - assert(m_mi != NULL); - unsigned char rs[81U]; - ::memset(rs, 0x00U, 81U); - - for (unsigned int i = 0; i < P25_MI_LENGTH_BYTES; i++) - rs[i] = m_mi[i]; // Message Indicator - - rs[9U] = m_mfId; // Mfg Id. - rs[10U] = m_algId; // Algorithm ID - rs[11U] = (m_kId >> 8) & 0xFFU; // Key ID MSB - rs[12U] = (m_kId >> 0) & 0xFFU; // Key ID LSB - rs[13U] = (m_dstId >> 8) & 0xFFU; // Talkgroup Address MSB - rs[14U] = (m_dstId >> 0) & 0xFFU; // Talkgroup Address LSB - - // encode RS (36,20,17) FEC - m_rs241213.encode362017(rs); - - unsigned char raw[81U]; - ::memset(raw, 0x00U, 81U); - - // encode Golay (18,6,8) FEC - encodeHeaderGolay(raw, rs); - - // interleave - CP25Utils::encode(raw, data, 114U, 780U); + CP25Utils::encode(DUMMY_HEADER, data, 114U, 780U); } bool CP25Data::decodeLDU1(const unsigned char* data) @@ -238,96 +185,27 @@ void CP25Data::encodeLDU1(unsigned char* data) CP25Utils::encode(raw, data, 1356U, 1398U); } -bool CP25Data::decodeLDU2(const unsigned char* data) -{ - assert(data != NULL); - - unsigned char rs[18U]; - - // deinterleave and decode Hamming (10,6,3) for LC data - unsigned char raw[5U]; - CP25Utils::decode(data, raw, 410U, 452U); - decodeLDUHamming(raw, rs + 0U); - - CP25Utils::decode(data, raw, 600U, 640U); - decodeLDUHamming(raw, rs + 3U); - - CP25Utils::decode(data, raw, 788U, 830U); - decodeLDUHamming(raw, rs + 6U); - - CP25Utils::decode(data, raw, 978U, 1020U); - decodeLDUHamming(raw, rs + 9U); - - CP25Utils::decode(data, raw, 1168U, 1208U); - decodeLDUHamming(raw, rs + 12U); - - CP25Utils::decode(data, raw, 1356U, 1398U); - decodeLDUHamming(raw, rs + 15U); - - // decode RS (24,16,9) FEC - try { - bool ret = m_rs241213.decode24169(rs); - if (!ret) - return false; - } catch (...) { - CUtils::dump(2U, "P25, RS crashed with input data", rs, 18U); - return false; - } - - m_algId = rs[9U]; // Algorithm ID - if (m_algId != P25_ALGO_UNENCRYPT) { - m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); - ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator - - m_kId = (rs[10U] << 8) + rs[11U]; // Key ID - } - else { - m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); - - m_kId = 0x0000U; - } - - return true; -} - void CP25Data::encodeLDU2(unsigned char* data) { assert(data != NULL); - assert(m_mi != NULL); - unsigned char rs[18U]; - ::memset(rs, 0x00U, 18U); - - for (unsigned int i = 0; i < P25_MI_LENGTH_BYTES; i++) - rs[i] = m_mi[i]; // Message Indicator - - rs[9U] = m_algId; // Algorithm ID - rs[10U] = (m_kId >> 8) & 0xFFU; // Key ID MSB - rs[11U] = (m_kId >> 0) & 0xFFU; // Key ID LSB - - // encode RS (24,16,9) FEC - m_rs241213.encode24169(rs); - - // encode Hamming (10,6,3) FEC and interleave for LC data unsigned char raw[5U]; - encodeLDUHamming(raw, rs + 0U); + encodeLDUHamming(raw, DUMMY_LDU2 + 0U); CP25Utils::encode(raw, data, 410U, 452U); - encodeLDUHamming(raw, rs + 3U); + encodeLDUHamming(raw, DUMMY_LDU2 + 3U); CP25Utils::encode(raw, data, 600U, 640U); - encodeLDUHamming(raw, rs + 6U); + encodeLDUHamming(raw, DUMMY_LDU2 + 6U); CP25Utils::encode(raw, data, 788U, 830U); - encodeLDUHamming(raw, rs + 9U); + encodeLDUHamming(raw, DUMMY_LDU2 + 9U); CP25Utils::encode(raw, data, 978U, 1020U); - encodeLDUHamming(raw, rs + 12U); + encodeLDUHamming(raw, DUMMY_LDU2 + 12U); CP25Utils::encode(raw, data, 1168U, 1208U); - encodeLDUHamming(raw, rs + 15U); + encodeLDUHamming(raw, DUMMY_LDU2 + 15U); CP25Utils::encode(raw, data, 1356U, 1398U); } @@ -589,59 +467,3 @@ void CP25Data::encodeLDUHamming(unsigned char* data, const unsigned char* raw) } } } - -void CP25Data::decodeHeaderGolay(const unsigned char* data, unsigned char* raw) -{ - // shortened Golay (18,6,8) decode - unsigned int n = 0U; - unsigned int m = 0U; - for (unsigned int i = 0U; i < 36U; i++) { - bool golay[18U]; - for (unsigned int j = 0U; j < 18U; j++) { - golay[j] = READ_BIT(data, n); - n++; - } - - unsigned int g0 = 0U; - for (unsigned int j = 0U; j < 18U; j++) - g0 = (g0 << 1) | (golay[j] ? 0x01U : 0x00U); - unsigned int c0data = CGolay24128::decode24128(g0); - for (int j = 5; j >= 0; j--) { - golay[j] = (c0data & 0x01U) == 0x01U; - c0data >>= 1; - } - - for (unsigned int j = 0U; j < 6U; j++) { - WRITE_BIT(raw, m, golay[j]); - m++; - } - } -} - -void CP25Data::encodeHeaderGolay(unsigned char* data, const unsigned char* raw) -{ - // shortened Golay (18,6,8) encode - unsigned int n = 0U; - unsigned int m = 0U; - for (unsigned int i = 0U; i < 36U; i++) { - bool golay[18U]; - for (unsigned int j = 0U; j < 6U; j++) { - golay[j] = READ_BIT(raw, m); - m++; - } - - unsigned int c0data = 0U; - for (unsigned int j = 0U; j < 6U; j++) - c0data = (c0data << 1) | (golay[j] ? 0x01U : 0x00U); - unsigned int g0 = CGolay24128::encode24128(c0data); - for (int j = 17; j >= 0; j--) { - golay[j] = (g0 & 0x01U) == 0x01U; - g0 >>= 1; - } - - for (unsigned int j = 0U; j < 18U; j++) { - WRITE_BIT(data, n, golay[j]); - n++; - } - } -} diff --git a/P25Data.h b/P25Data.h index 3d312d8..1b9eec9 100644 --- a/P25Data.h +++ b/P25Data.h @@ -28,13 +28,11 @@ public: CP25Data(); ~CP25Data(); - bool decodeHeader(const unsigned char* data); void encodeHeader(unsigned char* data); bool decodeLDU1(const unsigned char* data); void encodeLDU1(unsigned char* data); - bool decodeLDU2(const unsigned char* data); void encodeLDU2(unsigned char* data); bool decodeTSDU(const unsigned char* data); @@ -84,9 +82,6 @@ private: void decodeLDUHamming(const unsigned char* raw, unsigned char* data); void encodeLDUHamming(unsigned char* data, const unsigned char* raw); - - void decodeHeaderGolay(const unsigned char* raw, unsigned char* data); - void encodeHeaderGolay(unsigned char* data, const unsigned char* raw); }; #endif diff --git a/P25Defines.h b/P25Defines.h index 815f75a..6ceda75 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -55,8 +55,6 @@ const unsigned int P25_PDU_FEC_LENGTH_BITS = P25_PDU_FEC_LENGTH_BYTES const unsigned int P25_MI_LENGTH_BYTES = 9U; -const unsigned char P25_ALGO_UNENCRYPT = 0x80U; - const unsigned char P25_LCF_GROUP = 0x00U; const unsigned char P25_LCF_PRIVATE = 0x03U; diff --git a/RS241213.cpp b/RS241213.cpp index d5c2f03..3e929d0 100644 --- a/RS241213.cpp +++ b/RS241213.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp * * 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 @@ -21,7 +20,6 @@ #include #include -#include const unsigned char ENCODE_MATRIX[12U][24U] = { {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 062, 044, 003, 025, 014, 016, 027, 003, 053, 004, 036, 047}, @@ -37,46 +35,6 @@ const unsigned char ENCODE_MATRIX[12U][24U] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 073, 065, 036, 061, 042, 022, 017, 004, 044, 020, 025, 005}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 071, 005, 055, 003, 071, 034, 060, 011, 074, 002, 041, 050}}; -const unsigned char ENCODE_MATRIX_24169[16U][24U] = { - { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 051, 045, 067, 015, 064, 067, 052, 012 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 057, 025, 063, 073, 071, 022, 040, 015 }, - { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 005, 001, 031, 004, 016, 054, 025, 076 }, - { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 073, 007, 047, 014, 041, 077, 047, 011 }, - { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 075, 015, 051, 051, 017, 067, 017, 057 }, - { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 020, 032, 014, 042, 075, 042, 070, 054 }, - { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 002, 075, 043, 005, 001, 040, 012, 064 }, - { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 024, 074, 015, 072, 024, 026, 074, 061 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 042, 064, 007, 022, 061, 020, 040, 065 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 032, 032, 055, 041, 057, 066, 021, 077 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 065, 036, 025, 007, 050, 016, 040, 051 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 064, 006, 054, 032, 076, 046, 014, 036 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 062, 063, 074, 070, 005, 027, 037, 046 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 055, 043, 034, 071, 057, 076, 050, 064 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 024, 023, 023, 005, 050, 070, 042, 023 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 067, 075, 045, 060, 057, 024, 006, 026 } }; - -const unsigned char ENCODE_MATRIX_362017[20U][36U] = { - { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 037, 034, 006, 002, 007, 044, 064, 026, 014, 026, 044, 054, 013, 077, 005 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 004, 017, 050, 024, 011, 005, 030, 057, 033, 003, 002, 002, 015, 016, 025, 026 }, - { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 007, 023, 037, 046, 056, 075, 043, 045, 055, 021, 050, 031, 045, 027, 071, 062 }, - { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 026, 005, 007, 063, 063, 027, 063, 040, 006, 004, 040, 045, 047, 030, 075, 007 }, - { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 023, 073, 073, 041, 072, 034, 021, 051, 067, 016, 031, 074, 011, 021, 012, 021 }, - { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 024, 051, 025, 023, 022, 041, 074, 066, 074, 065, 070, 036, 067, 045, 064, 001 }, - { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 052, 033, 014, 002, 020, 006, 014, 025, 052, 023, 035, 074, 075, 075, 043, 027 }, - { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 055, 062, 056, 025, 073, 060, 015, 030, 013, 017, 020, 002, 070, 055, 014, 047 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 051, 032, 065, 077, 012, 054, 013, 035, 032, 056, 012, 075, 001, 072, 063 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 041, 030, 041, 043, 022, 051, 006, 064, 033, 003, 047, 027, 012, 055, 047 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 070, 011, 003, 013, 022, 016, 057, 003, 045, 072, 031, 030, 056, 035, 022 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 051, 007, 072, 030, 065, 054, 006, 021, 036, 063, 050, 061, 064, 052, 001, 060 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 001, 065, 032, 070, 013, 044, 073, 024, 012, 052, 021, 055, 012, 035, 014, 072 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 011, 070, 005, 010, 065, 024, 015, 077, 022, 024, 024, 074, 007, 044, 007, 046 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 006, 002, 065, 011, 041, 020, 045, 042, 046, 054, 035, 012, 040, 064, 065, 033 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 034, 031, 001, 015, 044, 064, 016, 024, 052, 016, 006, 062, 020, 013, 055, 057 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 063, 043, 025, 044, 077, 063, 017, 017, 064, 014, 040, 074, 031, 072, 054, 006 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 071, 021, 070, 044, 056, 004, 030, 074, 004, 023, 071, 070, 063, 045, 056, 043 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 002, 001, 053, 074, 002, 014, 052, 074, 012, 057, 024, 063, 015, 042, 052, 033 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 034, 035, 002, 023, 021, 027, 022, 033, 064, 042, 005, 073, 051, 046, 073, 060 } }; - const unsigned int rsGFexp[64] = { 1, 2, 4, 8, 16, 32, 3, 6, 12, 24, 48, 35, 5, 10, 20, 40, 19, 38, 15, 30, 60, 59, 53, 41, 17, 34, 7, 14, 28, 56, 51, 37, @@ -127,121 +85,21 @@ CRS241213::~CRS241213() } bool CRS241213::decode(unsigned char* data) -{ - return decode(data, 24U, 39, 12); -} - -void CRS241213::encode(unsigned char* data) { assert(data != NULL); - unsigned char codeword[24U]; - - for (unsigned int i = 0U; i < 24U; i++) { - codeword[i] = 0x00U; - - unsigned int offset = 0U; - for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { - unsigned char hexbit = bin2Hex(data, offset); - codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); - } - } + unsigned char HB[24U]; unsigned int offset = 0U; for (unsigned int i = 0U; i < 24U; i++, offset += 6U) - hex2Bin(codeword[i], data, offset); -} - -bool CRS241213::decode24169(unsigned char* data) -{ - return decode(data, 24U, 39, 8); -} - -void CRS241213::encode24169(unsigned char* data) -{ - assert(data != NULL); - - unsigned char codeword[24U]; - - for (unsigned int i = 0U; i < 24U; i++) { - codeword[i] = 0x00U; - - unsigned int offset = 0U; - for (unsigned int j = 0U; j < 16U; j++, offset += 6U) { - unsigned char hexbit = bin2Hex(data, offset); - codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_24169[j][i]); - } - } - - unsigned int offset = 0U; - for (unsigned int i = 0U; i < 24U; i++, offset += 6U) - hex2Bin(codeword[i], data, offset); -} - -bool CRS241213::decode362017(unsigned char* data) -{ - return decode(data, 36U, 27, 16); -} - -void CRS241213::encode362017(unsigned char* data) -{ - assert(data != NULL); - - unsigned char codeword[36U]; - - for (unsigned int i = 0U; i < 36U; i++) { - codeword[i] = 0x00U; - - unsigned int offset = 0U; - for (unsigned int j = 0U; j < 20U; j++, offset += 6U) { - unsigned char hexbit = bin2Hex(data, offset); - codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_362017[j][i]); - } - } - - unsigned int offset = 0U; - for (unsigned int i = 0U; i < 36U; i++, offset += 6U) - hex2Bin(codeword[i], data, offset); -} - -// GF(2 ^ 6) multiply(for Reed - Solomon encoder) -unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const -{ - unsigned char p = 0x00U; - - for (unsigned int i = 0U; i < 6U; i++) { - if ((b & 0x01U) == 0x01U) - p ^= a; - - a <<= 1; - - if ((a & 0x40U) == 0x40U) - a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 - - b >>= 1; - } - - return p; -} - -bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots) -{ - assert(data != NULL); - - //unsigned char HB[24U]; - unsigned char HB[63U]; - ::memset(HB, 0x00U, 63U); - - unsigned int offset = 0U; - for (unsigned int i = 0U; i < bitLength; i++, offset += 6) HB[i] = bin2Hex(data, offset); //RS (63,63-nroots,nroots+1) decoder where nroots = number of parity bits // rsDec(8, 39) rsDec(16, 27) rsDec(12, 39) - const int nroots = roots; - int lambda[18]; // Err+Eras Locator poly - int S[17]; // syndrome poly + const int nroots = 12; + int lambda[18];//Err+Eras Locator poly + int S[17];//syndrome poly int b[18]; int t[18]; int omega[18]; @@ -251,25 +109,22 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const int i, j, count, r, el, SynError, DiscrR, q, DegOmega, tmp, num1, num2, den, DegLambda; - // form the syndromes; i.e., evaluate HB(x) at roots of g(x) + //form the syndromes; i.e., evaluate HB(x) at roots of g(x) for (i = 0; i <= nroots - 1; i++) { S[i] = HB[0]; } - //for (j = 1; j <= 24; j++) { // XXX was 62 - //for (j = 1; j <= (int)(bitLength - 1); j++) { - for (j = 1; j <= 62; j++) { + for (j = 1; j <= 23; j++) { // XXX was 62 for (i = 0; i <= nroots - 1; i++) { if (S[i] == 0) { S[i] = HB[j]; - } - else { + } else { S[i] = HB[j] ^ rsGFexp[(rsGFlog[S[i]] + i + 1) % 63]; } } } - // convert syndromes to index form, checking for nonzero condition + //convert syndromes to index form, checking for nonzero condition SynError = 0; for (i = 0; i <= nroots - 1; i++) { @@ -278,8 +133,8 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const } if (SynError == 0) { - // if syndrome is zero, rsData[] is a codeword and there are - // no errors to correct. So return rsData[] unmodified + //if syndrome is zero, rsData[] is a codeword and there are + //no errors to correct. So return rsData[] unmodified count = 0; return true; } @@ -294,14 +149,13 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const b[i] = rsGFlog[lambda[i]]; } - // begin Berlekamp-Massey algorithm to determine error+erasure - // locator polynomial + //begin Berlekamp-Massey algorithm to determine error+erasure + //locator polynomial r = 0; el = 0; - while (++r <= nroots) { - // r is the step number - //r = r + 1; - // compute discrepancy at the r-th step in poly-form + while (r < nroots) { //r is the step number + r = r + 1; + //compute discrepancy at the r-th step in poly-form DiscrR = 0; for (i = 0; i <= r - 1; i++) { @@ -310,48 +164,44 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const } } - DiscrR = rsGFlog[DiscrR]; // index form + DiscrR = rsGFlog[DiscrR];//index form if (DiscrR == 63) { - // shift elements upward one step + //shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } b[0] = 63; - } - else { - // t(x) <-- lambda(x) - DiscrR*x*b(x) + } else { + //t(x) <-- lambda(x) - DiscrR*x*b(x) t[0] = lambda[0]; - + for (i = 0; i <= nroots - 1; i++) { if (b[i] != 63) { t[i + 1] = lambda[i + 1] ^ rsGFexp[(DiscrR + b[i]) % 63]; - } - else { + } else { t[i + 1] = lambda[i + 1]; } } - + if (2 * el <= r - 1) { el = r - el; - // b(x) <-- inv(DiscrR) * lambda(x) + //b(x) <-- inv(DiscrR) * lambda(x) for (i = 0; i <= nroots; i++) { if (lambda[i]) { b[i] = (rsGFlog[lambda[i]] - DiscrR + 63) % 63; - } - else { + } else { b[i] = 63; } } - } - else { - // shift elements upward one step + } else { + //shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } - + b[0] = 63; } @@ -359,9 +209,9 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const lambda[i] = t[i]; } } - } /* end while() */ + } /* end while() */ - // convert lambda to index form and compute deg(lambda(x)) + //convert lambda to index form and compute deg(lambda(x)) DegLambda = 0; for (i = 0; i <= nroots; i++) { lambda[i] = rsGFlog[lambda[i]]; @@ -371,16 +221,16 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const } } - // Find roots of the error+erasure locator polynomial by Chien search + //Find roots of the error+erasure locator polynomial by Chien search for (i = 1; i <= nroots; i++) { reg[i] = lambda[i]; } - count = 0;// number of roots of lambda(x) + count = 0;//number of roots of lambda(x) for (i = 1; i <= 63; i++) { - q = 1;// lambda[0] is always 0 - + q = 1;//lambda[0] is always 0 + for (j = DegLambda; j >= 1; j += -1) { if (reg[j] != 63) { reg[j] = (reg[j] + j) % 63; @@ -388,14 +238,13 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const } } - // it is a root - if (q == 0) { - // store root (index-form) and error location number + if (q == 0) { //it is a root + //store root (index-form) and error location number root[count] = i; locn[count] = i - 40; - // if we have max possible roots, abort search to save time + //if wehave max possible roots, abort search to save time count = count + 1; - + if (count == DegLambda) { break; } @@ -403,19 +252,18 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const } if (DegLambda != count) { - // deg(lambda) unequal to number of roots => uncorrectable error detected + //deg(lambda) unequal to number of roots => uncorrectable error detected return false; } - // compute err+eras evaluator poly omega(x) + //compute err+eras evaluator poly omega(x) // = s(x)*lambda(x) (modulo x**nroots). in index form. Also find deg(omega). DegOmega = 0; for (i = 0; i <= nroots - 1; i++) { tmp = 0; if (DegLambda < i) { j = DegLambda; - } - else { + } else { j = i; } @@ -453,8 +301,7 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const // lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] if (DegLambda < nroots) { i = DegLambda; - } - else { + } else { i = nroots; } @@ -470,15 +317,55 @@ bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const // apply error to data if (num1 != 0) { - if (locn[j] < firstData) - return false; - HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); + if(locn[j] < 24) + HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); } } offset = 0U; - for (unsigned int i = 0U; i < (unsigned int)nroots; i++, offset += 6) + for (unsigned int i = 0U; i < 12U; i++, offset += 6U) hex2Bin(HB[i], data, offset); return true; } + +void CRS241213::encode(unsigned char* data) +{ + assert(data != NULL); + + unsigned char codeword[24U]; + + for (unsigned int i = 0U; i < 24U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); + } + } + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < 24U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +// GF(2 ^ 6) multiply(for Reed - Solomon encoder) +unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const +{ + unsigned char p = 0x00U; + + for (unsigned int i = 0U; i < 6U; i++) { + if ((b & 0x01U) == 0x01U) + p ^= a; + + a <<= 1; + + if ((a & 0x40U) == 0x40U) + a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 + + b >>= 1; + } + + return p; +} diff --git a/RS241213.h b/RS241213.h index 9b23011..fe3171a 100644 --- a/RS241213.h +++ b/RS241213.h @@ -1,6 +1,5 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp * * 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 @@ -27,16 +26,11 @@ public: ~CRS241213(); bool decode(unsigned char* data); - bool decode24169(unsigned char* data); - bool decode362017(unsigned char* data); void encode(unsigned char* data); - void encode24169(unsigned char* data); - void encode362017(unsigned char* data); private: unsigned char gf6Mult(unsigned char a, unsigned char b) const; - bool decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots); }; #endif From 3362e29b629b27a639185da5eb9d1b7cdfbfa382 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 12 Nov 2018 11:57:34 +0000 Subject: [PATCH 02/15] First attempt at detecting D-Star data frames, Kenwood and Icom. --- DStarControl.cpp | 160 ++++++++++++++++++++++++++++++++++------------- DStarDefines.h | 3 + Utils.cpp | 19 ++++++ Utils.h | 2 + 4 files changed, 140 insertions(+), 44 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index cddc9d6..20d1a32 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -122,7 +122,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) unsigned char type = data[0U]; - if (type == TAG_LOST && m_rfState == RS_RF_AUDIO) { + if (type == TAG_LOST && (m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA)) { if (m_rssi != 0U) LogMessage("D-Star, transmission lost, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 50.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); else @@ -304,7 +304,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } return false; - } else if (m_rfState == RS_RF_AUDIO) { + } else if (m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA) { if (m_net) writeNetworkDataRF(DSTAR_END_PATTERN_BYTES, 0U, true); @@ -321,11 +321,13 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) return false; } else if (type == TAG_DATA) { - if (m_rfState == RS_RF_REJECTED) { + if (m_rfState == RS_RF_REJECTED) return false; - } else if (m_rfState == RS_RF_INVALID) { + + if (m_rfState == RS_RF_INVALID) return false; - } else if (m_rfState == RS_RF_LISTENING) { + + if (m_rfState == RS_RF_LISTENING) { // The sync is regenerated by the modem so can do exact match if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) { m_slowData.start(); @@ -333,6 +335,41 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } return false; + } + + // Data signatures only appear at the beginning of the frame + if (m_rfState == RS_RF_AUDIO && m_rfFrames < 21U) { + if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Kenwood)"); + m_rfState = RS_RF_DATA; + } else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Icom)"); + m_rfState = RS_RF_DATA; + } + } + + if (m_rfState == RS_RF_DATA) { + m_rfBits += 72U; + m_rfErrs = 0U; + m_rfFrames++; + + // The sync is regenerated by the modem so can do exact match + if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) + m_rfN = 0U; + + // Regenerate the sync and send the RSSI data to the display + if (m_rfN == 0U) { + CSync::addDStarSync(data + 1U); + m_display->writeDStarRSSI(m_rssi); + } + + if (m_net) + writeNetworkDataRF(data, 0U, false); + + if (m_duplex) + writeQueueDataRF(data); + + m_rfN = (m_rfN + 1U) % 21U; } else if (m_rfState == RS_RF_AUDIO) { unsigned int errors = 0U; if (!m_rfHeader.isDataPacket()) { @@ -340,6 +377,10 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) m_display->writeDStarBER(float(errors) / 0.48F); LogDebug("D-Star, audio sequence no. %u, errs: %u/48 (%.1f%%)", m_rfN, errors, float(errors) / 0.48F); m_rfErrs += errors; + + // The sync is regenerated by the modem so can do exact match + if (::memcmp(data + 1U + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES) == 0) + m_rfN = 0U; } m_rfBits += 48U; @@ -567,7 +608,7 @@ void CDStarControl::writeNetwork() if (length == 0U) return; - if (m_rfState == RS_RF_AUDIO && m_netState == RS_NET_IDLE) + if ((m_rfState == RS_RF_AUDIO || m_rfState == RS_RF_DATA) && m_netState == RS_NET_IDLE) return; m_networkWatchdog.start(); @@ -637,57 +678,87 @@ void CDStarControl::writeNetwork() m_elapsed.start(); } else if (type == TAG_EOT) { - if (m_netState != RS_NET_AUDIO) - return; + if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA) { + writeQueueEOTNet(); - writeQueueEOTNet(); - - data[1U] = TAG_EOT; + data[1U] = TAG_EOT; #if defined(DUMP_DSTAR) - writeFile(data + 1U, length - 1U); - closeFile(); + writeFile(data + 1U, length - 1U); + closeFile(); #endif - // We've received the header and EOT haven't we? - m_netFrames += 2U; - LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); + // We've received the header and EOT haven't we? + m_netFrames += 2U; + LogMessage("D-Star, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 50.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); - writeEndNet(); + writeEndNet(); + } } else if (type == TAG_DATA) { - if (m_netState != RS_NET_AUDIO) - return; + // Data signatures only appear at the beginning of the frame + if (m_netState == RS_NET_AUDIO && m_netFrames < 21U) { + if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Kenwood)"); + m_rfState = RS_RF_DATA; + } else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Icom)"); + m_rfState = RS_RF_DATA; + } + } - unsigned char n = data[1U]; + if (m_netState == RS_NET_DATA) { + unsigned char n = data[1U]; - unsigned int errors = 0U; - if (!m_netHeader.isDataPacket()) - errors = m_fec.regenerateDStar(data + 2U); + data[1U] = TAG_DATA; - blankDTMF(data + 2U); + m_netBits += 72U; + m_netErrs = 0U; - data[1U] = TAG_DATA; + m_netN = n; - // Insert silence and reject if in the past - bool ret = insertSilence(data + 1U, n); - if (!ret) - return; + // Regenerate the sync + if (n == 0U) + CSync::addDStarSync(data + 2U); - m_netErrs += errors; - m_netBits += 48U; - - m_netN = n; - - // Regenerate the sync - if (n == 0U) - CSync::addDStarSync(data + 2U); - - m_packetTimer.start(); - m_netFrames++; + m_packetTimer.start(); + m_netFrames++; #if defined(DUMP_DSTAR) - writeFile(data + 1U, length - 1U); + writeFile(data + 1U, length - 1U); #endif - writeQueueDataNet(data + 1U); + writeQueueDataNet(data + 1U); + } else if (m_netState == RS_NET_AUDIO) { + unsigned char n = data[1U]; + + unsigned int errors = 0U; + if (!m_netHeader.isDataPacket()) + errors = m_fec.regenerateDStar(data + 2U); + + blankDTMF(data + 2U); + + data[1U] = TAG_DATA; + + // Insert silence and reject if in the past + bool ret = insertSilence(data + 1U, n); + if (!ret) + return; + + m_netErrs += errors; + m_netBits += 48U; + + m_netN = n; + + // Regenerate the sync + if (n == 0U) + CSync::addDStarSync(data + 2U); + + m_packetTimer.start(); + m_netFrames++; + +#if defined(DUMP_DSTAR) + writeFile(data + 1U, length - 1U); +#endif + writeQueueDataNet(data + 1U); + } } else { CUtils::dump("D-Star, unknown data from network", data, DSTAR_FRAME_LENGTH_BYTES + 1U); } @@ -716,7 +787,7 @@ void CDStarControl::clock() m_rfTimeoutTimer.clock(ms); m_netTimeoutTimer.clock(ms); - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA) { m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { @@ -730,7 +801,7 @@ void CDStarControl::clock() } } - if (m_netState == RS_NET_AUDIO) { + if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA) { m_packetTimer.clock(ms); if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) { @@ -1123,3 +1194,4 @@ void CDStarControl::sendError() writeQueueEOTRF(); } + diff --git a/DStarDefines.h b/DStarDefines.h index 498b35e..0e32e29 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -36,6 +36,9 @@ const unsigned char DSTAR_NULL_SLOW_DATA_BYTES[] = { 0x16, 0x29, 0xF5 }; const unsigned char DSTAR_NULL_FRAME_SYNC_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x55, 0x2D, 0x16 }; const unsigned char DSTAR_NULL_FRAME_DATA_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x16, 0x29, 0xF5 }; +const unsigned char DSTAR_KENWOOD_DATA_MODE_BYTES[] = { 0xEEU, 0xC2U, 0xA1U, 0xC8U, 0x42U, 0x6EU, 0x52U, 0x51U, 0xC3U }; +const unsigned char DSTAR_ICOM_DATA_MODE_BYTES[] = { 0xB2U, 0x4DU, 0x22U, 0x48U, 0xC0U, 0x16U, 0x28U, 0x26U, 0xC8U }; + const unsigned int DSTAR_VOICE_FRAME_LENGTH_BYTES = 9U; const unsigned int DSTAR_DATA_FRAME_LENGTH_BYTES = 3U; diff --git a/Utils.cpp b/Utils.cpp index 49ded13..9bd8a06 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -144,3 +144,22 @@ void CUtils::bitsToByteLE(const bool* bits, unsigned char& byte) byte |= bits[6U] ? 0x40U : 0x00U; byte |= bits[7U] ? 0x80U : 0x00U; } + +unsigned int CUtils::compare(const unsigned char* bytes1, const unsigned char* bytes2, unsigned int length) +{ + assert(bytes1 != NULL); + assert(bytes2 != NULL); + + unsigned int diffs = 0U; + + for (unsigned int i = 0U; i < length; i++) { + unsigned char v = bytes1[i] ^ bytes2[i]; + while (v != 0U) { + v &= v - 1U; + diffs++; + } + } + + return diffs; +} + diff --git a/Utils.h b/Utils.h index ade28c0..96a2d2c 100644 --- a/Utils.h +++ b/Utils.h @@ -30,6 +30,8 @@ public: static void bitsToByteBE(const bool* bits, unsigned char& byte); static void bitsToByteLE(const bool* bits, unsigned char& byte); + static unsigned int compare(const unsigned char* bytes1, const unsigned char* bytes2, unsigned int length); + private: }; From 18398efe976f16fca76de38786a6849ac0197c74 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 12 Nov 2018 13:27:15 +0000 Subject: [PATCH 03/15] Fix a bug and add a second Icom D-Star fast data mode identifier. --- DStarControl.cpp | 14 ++++++++++---- DStarDefines.h | 5 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 20d1a32..f7a666e 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -342,7 +342,10 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { LogMessage("D-Star, switching to data mode (Kenwood)"); m_rfState = RS_RF_DATA; - } else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + } else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Icom)"); + m_rfState = RS_RF_DATA; + } else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { LogMessage("D-Star, switching to data mode (Icom)"); m_rfState = RS_RF_DATA; } @@ -698,10 +701,13 @@ void CDStarControl::writeNetwork() if (m_netState == RS_NET_AUDIO && m_netFrames < 21U) { if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { LogMessage("D-Star, switching to data mode (Kenwood)"); - m_rfState = RS_RF_DATA; - } else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + m_netState = RS_NET_DATA; + } else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { LogMessage("D-Star, switching to data mode (Icom)"); - m_rfState = RS_RF_DATA; + m_netState = RS_NET_DATA; + } else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) { + LogMessage("D-Star, switching to data mode (Icom)"); + m_netState = RS_NET_DATA; } } diff --git a/DStarDefines.h b/DStarDefines.h index 0e32e29..697f57a 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2018 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 @@ -37,7 +37,8 @@ const unsigned char DSTAR_NULL_FRAME_SYNC_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32 const unsigned char DSTAR_NULL_FRAME_DATA_BYTES[] = { TAG_DATA, 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x16, 0x29, 0xF5 }; const unsigned char DSTAR_KENWOOD_DATA_MODE_BYTES[] = { 0xEEU, 0xC2U, 0xA1U, 0xC8U, 0x42U, 0x6EU, 0x52U, 0x51U, 0xC3U }; -const unsigned char DSTAR_ICOM_DATA_MODE_BYTES[] = { 0xB2U, 0x4DU, 0x22U, 0x48U, 0xC0U, 0x16U, 0x28U, 0x26U, 0xC8U }; +const unsigned char DSTAR_ICOM_DATA_MODE_BYTES1[] = { 0xB2U, 0x4DU, 0x22U, 0x48U, 0xC0U, 0x16U, 0x28U, 0x26U, 0xC8U }; +const unsigned char DSTAR_ICOM_DATA_MODE_BYTES2[] = { 0x70U, 0x4FU, 0x93U, 0x40U, 0x64U, 0x74U, 0x6DU, 0x30U, 0x2BU }; const unsigned int DSTAR_VOICE_FRAME_LENGTH_BYTES = 9U; const unsigned int DSTAR_DATA_FRAME_LENGTH_BYTES = 3U; From 54fbacb4878059679740f4b0eda71f09ecf988b2 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 13 Nov 2018 08:47:40 +0000 Subject: [PATCH 04/15] Regenerate the data mode markers. --- DStarControl.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/DStarControl.cpp b/DStarControl.cpp index f7a666e..483484f 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -352,6 +352,16 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } if (m_rfState == RS_RF_DATA) { + // Regenerate the data mode markers + if (m_rfFrames < 21U) { + if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); + else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES); + else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES); + } + m_rfBits += 72U; m_rfErrs = 0U; m_rfFrames++; @@ -712,6 +722,16 @@ void CDStarControl::writeNetwork() } if (m_netState == RS_NET_DATA) { + // Regenerate the data mode markers + if (m_netFrames < 21U) { + if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); + else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES); + else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) + ::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES); + } + unsigned char n = data[1U]; data[1U] = TAG_DATA; From 1bd814a07910c053c813afcbcd6a34a0a15d5e39 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 16 Nov 2018 10:23:29 +0000 Subject: [PATCH 05/15] Don't insert silence on lost D-Star fast data. --- DStarControl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 483484f..9830a1d 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -827,7 +827,8 @@ void CDStarControl::clock() } } - if (m_netState == RS_NET_AUDIO || m_netState == RS_NET_DATA) { + // Only insert silence on audio data + if (m_netState == RS_NET_AUDIO) { m_packetTimer.clock(ms); if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) { From fba77bb95e241a3f1a9278443e9646031c4bdda3 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Fri, 7 Dec 2018 17:36:11 +0800 Subject: [PATCH 06/15] Add NullModem support --- MMDVMHost.cpp | 2 +- Makefile | 2 +- Modem.cpp | 8 ++++ Modem.h | 106 +++++++++++++++++++++++++------------------------- NullModem.cpp | 35 +++++++++++++++++ NullModem.h | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 204 insertions(+), 54 deletions(-) create mode 100644 NullModem.cpp create mode 100644 NullModem.h diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 98272e2..07df029 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1119,7 +1119,7 @@ bool CMMDVMHost::createModem() LogInfo(" RX Frequency: %uHz (%uHz)", rxFrequency, rxFrequency + rxOffset); LogInfo(" TX Frequency: %uHz (%uHz)", txFrequency, txFrequency + txOffset); - m_modem = new CModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); + m_modem = CModem::createModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); m_modem->setSerialParams(protocol,address); m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_pocsagEnabled); m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel); diff --git a/Makefile b/Makefile index c4d22d5..ea2597d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ + Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o diff --git a/Modem.cpp b/Modem.cpp index 8df71cf..899265f 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -25,6 +25,7 @@ #include "POCSAGDefines.h" #include "Thread.h" #include "Modem.h" +#include "NullModem.h" #include "Utils.h" #include "Log.h" @@ -1826,3 +1827,10 @@ void CModem::printDebug() LogMessage("Debug: %.*s %d %d %d %d", m_length - 11U, m_buffer + 3U, val1, val2, val3, val4); } } + +CModem* CModem::createModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug){ + if (port == "NullModem") + return new CNullModem(port, duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); + else + return new CModem(port, duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); +} \ No newline at end of file diff --git a/Modem.h b/Modem.h index 9c8b6c0..30af401 100644 --- a/Modem.h +++ b/Modem.h @@ -35,75 +35,77 @@ enum RESP_TYPE_MMDVM { class CModem { public: CModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug); - ~CModem(); + virtual ~CModem(); - void setSerialParams(const std::string& protocol, unsigned int address); - void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency); - void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled); - void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel); - void setDMRParams(unsigned int colorCode); - void setYSFParams(bool loDev, unsigned int txHang); - void setTransparentDataParams(unsigned int sendFrameType); + virtual void setSerialParams(const std::string& protocol, unsigned int address); + virtual void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency); + virtual void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled); + virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel); + virtual void setDMRParams(unsigned int colorCode); + virtual void setYSFParams(bool loDev, unsigned int txHang); + virtual void setTransparentDataParams(unsigned int sendFrameType); - bool open(); + virtual bool open(); - unsigned int readDStarData(unsigned char* data); - unsigned int readDMRData1(unsigned char* data); - unsigned int readDMRData2(unsigned char* data); - unsigned int readYSFData(unsigned char* data); - unsigned int readP25Data(unsigned char* data); - unsigned int readNXDNData(unsigned char* data); - unsigned int readTransparentData(unsigned char* data); + virtual unsigned int readDStarData(unsigned char* data); + virtual unsigned int readDMRData1(unsigned char* data); + virtual unsigned int readDMRData2(unsigned char* data); + virtual unsigned int readYSFData(unsigned char* data); + virtual unsigned int readP25Data(unsigned char* data); + virtual unsigned int readNXDNData(unsigned char* data); + virtual unsigned int readTransparentData(unsigned char* data); - unsigned int readSerial(unsigned char* data, unsigned int length); + virtual unsigned int readSerial(unsigned char* data, unsigned int length); - bool hasDStarSpace() const; - bool hasDMRSpace1() const; - bool hasDMRSpace2() const; - bool hasYSFSpace() const; - bool hasP25Space() const; - bool hasNXDNSpace() const; - bool hasPOCSAGSpace() const; + virtual bool hasDStarSpace() const; + virtual bool hasDMRSpace1() const; + virtual bool hasDMRSpace2() const; + virtual bool hasYSFSpace() const; + virtual bool hasP25Space() const; + virtual bool hasNXDNSpace() const; + virtual bool hasPOCSAGSpace() const; - bool hasTX() const; - bool hasCD() const; + virtual bool hasTX() const; + virtual bool hasCD() const; - bool hasLockout() const; - bool hasError() const; + virtual bool hasLockout() const; + virtual bool hasError() const; - bool writeDStarData(const unsigned char* data, unsigned int length); - bool writeDMRData1(const unsigned char* data, unsigned int length); - bool writeDMRData2(const unsigned char* data, unsigned int length); - bool writeYSFData(const unsigned char* data, unsigned int length); - bool writeP25Data(const unsigned char* data, unsigned int length); - bool writeNXDNData(const unsigned char* data, unsigned int length); - bool writePOCSAGData(const unsigned char* data, unsigned int length); + virtual bool writeDStarData(const unsigned char* data, unsigned int length); + virtual bool writeDMRData1(const unsigned char* data, unsigned int length); + virtual bool writeDMRData2(const unsigned char* data, unsigned int length); + virtual bool writeYSFData(const unsigned char* data, unsigned int length); + virtual bool writeP25Data(const unsigned char* data, unsigned int length); + virtual bool writeNXDNData(const unsigned char* data, unsigned int length); + virtual bool writePOCSAGData(const unsigned char* data, unsigned int length); - bool writeTransparentData(const unsigned char* data, unsigned int length); + virtual bool writeTransparentData(const unsigned char* data, unsigned int length); - bool writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); - bool writeDMRInfo(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); - bool writeYSFInfo(const char* source, const char* dest, const char* type, const char* origin); - bool writeP25Info(const char* source, bool group, unsigned int dest, const char* type); - bool writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type); - bool writePOCSAGInfo(unsigned int ric, const std::string& message); - bool writeIPInfo(const std::string& address); + virtual bool writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); + virtual bool writeDMRInfo(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); + virtual bool writeYSFInfo(const char* source, const char* dest, const char* type, const char* origin); + virtual bool writeP25Info(const char* source, bool group, unsigned int dest, const char* type); + virtual bool writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type); + virtual bool writePOCSAGInfo(unsigned int ric, const std::string& message); + virtual bool writeIPInfo(const std::string& address); - bool writeDMRStart(bool tx); - bool writeDMRShortLC(const unsigned char* lc); - bool writeDMRAbort(unsigned int slotNo); + virtual bool writeDMRStart(bool tx); + virtual bool writeDMRShortLC(const unsigned char* lc); + virtual bool writeDMRAbort(unsigned int slotNo); - bool writeSerial(const unsigned char* data, unsigned int length); + virtual bool writeSerial(const unsigned char* data, unsigned int length); - bool setMode(unsigned char mode); + virtual bool setMode(unsigned char mode); - bool sendCWId(const std::string& callsign); + virtual bool sendCWId(const std::string& callsign); - HW_TYPE getHWType() const; + virtual HW_TYPE getHWType() const; - void clock(unsigned int ms); + virtual void clock(unsigned int ms); - void close(); + virtual void close(); + + static CModem* createModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug); private: std::string m_port; diff --git a/NullModem.cpp b/NullModem.cpp new file mode 100644 index 0000000..8539f1b --- /dev/null +++ b/NullModem.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2011-2018 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 "NullModem.h" +#include "Log.h" + +CNullModem::CNullModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug) : +CModem(port, duplex,rxInvert, txInvert,pttInvert,txDelay, dmrDelay, trace, debug), +m_hwType(HWT_MMDVM) +{ +} + +CNullModem::~CNullModem() +{ +} + +bool CNullModem::open(){ + ::LogMessage("Opening the MMDVM Null Modem"); + return true; +} \ No newline at end of file diff --git a/NullModem.h b/NullModem.h new file mode 100644 index 0000000..2698f47 --- /dev/null +++ b/NullModem.h @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2011-2018 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. + */ + +#ifndef NULLMODEM_H +#define NULLMODEM_H + +#include "Modem.h" +#include "Defines.h" + +#include + + +class CNullModem : public CModem { +public: + CNullModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool trace, bool debug); + virtual ~CNullModem(); + + virtual void setSerialParams(const std::string& protocol, unsigned int address){}; + virtual void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency){}; + virtual void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled){}; + virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel){}; + virtual void setDMRParams(unsigned int colorCode){}; + virtual void setYSFParams(bool loDev, unsigned int txHang){}; + virtual void setTransparentDataParams(unsigned int sendFrameType){}; + + virtual bool open(); + + virtual unsigned int readDStarData(unsigned char* data){return 0;}; + virtual unsigned int readDMRData1(unsigned char* data){return 0;}; + virtual unsigned int readDMRData2(unsigned char* data){return 0;}; + virtual unsigned int readYSFData(unsigned char* data){return 0;}; + virtual unsigned int readP25Data(unsigned char* data){return 0;}; + virtual unsigned int readNXDNData(unsigned char* data){return 0;}; + virtual unsigned int readTransparentData(unsigned char* data){return 0;}; + + virtual unsigned int readSerial(unsigned char* data, unsigned int length){return 0;}; + + virtual bool hasDStarSpace()const {return true;}; + virtual bool hasDMRSpace1() const {return true;}; + virtual bool hasDMRSpace2() const {return true;}; + virtual bool hasYSFSpace() const {return true;}; + virtual bool hasP25Space() const {return true;}; + virtual bool hasNXDNSpace() const {return true;}; + virtual bool hasPOCSAGSpace() const{return true;}; + + virtual bool hasTX() const {return false;}; + virtual bool hasCD() const {return false;}; + + virtual bool hasLockout() const {return false;}; + virtual bool hasError() const {return false;}; + + virtual bool writeDStarData(const unsigned char* data, unsigned int length){return true;}; + virtual bool writeDMRData1(const unsigned char* data, unsigned int length){return true;}; + virtual bool writeDMRData2(const unsigned char* data, unsigned int length){return true;}; + virtual bool writeYSFData(const unsigned char* data, unsigned int length){return true;}; + virtual bool writeP25Data(const unsigned char* data, unsigned int length){return true;}; + virtual bool writeNXDNData(const unsigned char* data, unsigned int length){return true;}; + virtual bool writePOCSAGData(const unsigned char* data, unsigned int length){return true;}; + + virtual bool writeTransparentData(const unsigned char* data, unsigned int length){return true;}; + + virtual bool writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector){return true;}; + virtual bool writeDMRInfo(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type){return true;}; + virtual bool writeYSFInfo(const char* source, const char* dest, const char* type, const char* origin){return true;}; + virtual bool writeP25Info(const char* source, bool group, unsigned int dest, const char* type){return true;}; + virtual bool writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type){return true;}; + virtual bool writePOCSAGInfo(unsigned int ric, const std::string& message){return true;}; + virtual bool writeIPInfo(const std::string& address){return true;}; + + virtual bool writeDMRStart(bool tx){return true;}; + virtual bool writeDMRShortLC(const unsigned char* lc){return true;}; + virtual bool writeDMRAbort(unsigned int slotNo){return true;}; + + virtual bool writeSerial(const unsigned char* data, unsigned int length){return true;}; + + virtual bool setMode(unsigned char mode){return true;}; + + virtual bool sendCWId(const std::string& callsign){return true;}; + + virtual HW_TYPE getHWType() const {return m_hwType;}; + + virtual void clock(unsigned int ms){}; + + virtual void close(){}; + +private: + HW_TYPE m_hwType; +}; + +#endif From 833e3a5cbb733c0edb823c036a916b080c4a7feb Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 7 Dec 2018 14:57:00 +0000 Subject: [PATCH 07/15] Add VS2017 and other targets. --- MMDVMHost.vcxproj | 4 +++- MMDVMHost.vcxproj.filters | 8 +++++++- Makefile | 10 +++++----- Makefile.Pi | 10 +++++----- Makefile.Pi.Adafruit | 6 +++--- Makefile.Pi.HD44780 | 6 +++--- Makefile.Pi.OLED | 6 +++--- Makefile.Pi.PCF8574 | 6 +++--- Makefile.Solaris | 4 ++-- 9 files changed, 34 insertions(+), 26 deletions(-) diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj index 83cba81..0491601 100644 --- a/MMDVMHost.vcxproj +++ b/MMDVMHost.vcxproj @@ -194,6 +194,7 @@ + @@ -282,6 +283,7 @@ + @@ -327,4 +329,4 @@ - + \ No newline at end of file diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters index 200ee23..a91deba 100644 --- a/MMDVMHost.vcxproj.filters +++ b/MMDVMHost.vcxproj.filters @@ -278,6 +278,9 @@ Header Files + + Header Files + @@ -520,5 +523,8 @@ Source Files + + Source Files + - + \ No newline at end of file diff --git a/Makefile b/Makefile index ea2597d..44502b2 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,11 @@ LDFLAGS = -g OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ - NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ - POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ - Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o \ + NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o \ + POCSAGControl.o POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o \ + Thread.o Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o all: MMDVMHost diff --git a/Makefile.Pi b/Makefile.Pi index dc8e1aa..3a19521 100644 --- a/Makefile.Pi +++ b/Makefile.Pi @@ -9,11 +9,11 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o \ - NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \ - NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o POCSAGNetwork.o \ - QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o \ - UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ + NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ + POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o \ + UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o all: MMDVMHost diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit index 1065ed3..2ffa9fb 100644 --- a/Makefile.Pi.Adafruit +++ b/Makefile.Pi.Adafruit @@ -9,9 +9,9 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ - NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ + NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780 index fd3c32f..c70c081 100644 --- a/Makefile.Pi.HD44780 +++ b/Makefile.Pi.HD44780 @@ -9,9 +9,9 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ - NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ + NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 9c17f06..542b804 100644 --- a/Makefile.Pi.OLED +++ b/Makefile.Pi.OLED @@ -9,9 +9,9 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ - NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ + NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574 index 29dba7c..fc4a73e 100644 --- a/Makefile.Pi.PCF8574 +++ b/Makefile.Pi.PCF8574 @@ -9,9 +9,9 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o \ - Nextion.o NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ - NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ + NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ + NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \ Timer.o UDPSocket.o UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o diff --git a/Makefile.Solaris b/Makefile.Solaris index b82ee32..6691d3e 100644 --- a/Makefile.Solaris +++ b/Makefile.Solaris @@ -10,8 +10,8 @@ OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o \ - NullDisplay.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o \ - NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o POCSAGNetwork.o \ + NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ + NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o POCSAGNetwork.o \ QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o \ UMP.o Utils.o YSFControl.o YSFConvolution.o YSFFICH.o YSFNetwork.o YSFPayload.o From 570eaab40ec4dee6311aaaa9bf01098d0e722de8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 8 Dec 2018 07:41:37 +0100 Subject: [PATCH 08/15] Fix Makefile (ref. 833e3a5) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44502b2..e40ccea 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ LDFLAGS = -g OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ - DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o + DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o \ NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o \ POCSAGControl.o POCSAGNetwork.o QR1676.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o \ From 52b1bc40598a1f49f2bd5b6479278b90cc3e879b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 8 Dec 2018 10:33:52 +0000 Subject: [PATCH 09/15] Remove MR checking for incoming RF traffic. Should fix remote gateway in YSF mode. --- YSFControl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/YSFControl.cpp b/YSFControl.cpp index fdd0c96..79237a0 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -182,6 +182,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len) } } +#ifdef notdef // Stop repeater packets coming through, unless we're acting as a remote gateway if (m_remoteGateway) { unsigned char mr = m_lastFICH.getMR(); @@ -192,6 +193,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len) if (mr == YSF_MR_BUSY) return false; } +#endif unsigned char dt = m_lastFICH.getDT(); From 50c2500f829e629e8d6b1a209582874eb2b0a471 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Sat, 8 Dec 2018 22:09:59 +0800 Subject: [PATCH 10/15] Extract the DMR talker alias decode logic from Display.cpp --- DMRSlot.cpp | 53 ++++++++++----------- DMRSlot.h | 3 +- DMRTA.cpp | 111 +++++++++++++++++++++++++++++++++++++++++++ DMRTA.h | 36 ++++++++++++++ Display.cpp | 43 +---------------- Makefile | 2 +- Makefile.Pi | 2 +- Makefile.Pi.Adafruit | 2 +- Makefile.Pi.HD44780 | 2 +- Makefile.Pi.OLED | 2 +- Makefile.Pi.PCF8574 | 2 +- Makefile.Solaris | 2 +- 12 files changed, 183 insertions(+), 77 deletions(-) create mode 100644 DMRTA.cpp create mode 100644 DMRTA.h diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 124bdf1..2067570 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -80,7 +80,7 @@ m_rfEmbeddedData(NULL), m_rfEmbeddedReadN(0U), m_rfEmbeddedWriteN(1U), m_rfTalkerId(TALKER_ID_NONE), -m_rfTalkerAlias(NULL), +m_rfTalkerAlias(), m_netEmbeddedLC(), m_netEmbeddedData(NULL), m_netEmbeddedReadN(0U), @@ -117,8 +117,6 @@ m_aveRSSI(0U), m_rssiCount(0U), m_fp(NULL) { - m_rfTalkerAlias = new unsigned char[32U]; - m_lastFrame = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; m_rfEmbeddedData = new CDMREmbeddedData[2U]; @@ -132,7 +130,6 @@ CDMRSlot::~CDMRSlot() delete[] m_rfEmbeddedData; delete[] m_netEmbeddedData; delete[] m_lastFrame; - delete[] m_rfTalkerAlias; } bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) @@ -632,9 +629,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_HEADER)) { if (m_rfTalkerId == TALKER_ID_NONE) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias, data, 6U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "R"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data, 6U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo); @@ -651,9 +648,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK1)) { if (m_rfTalkerId == TALKER_ID_NONE) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias + 6U, data, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "R"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo); @@ -670,9 +667,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK2)) { if (m_rfTalkerId == TALKER_ID_NONE) - ::memset(m_rfTalkerAlias, 0, 32U); - ::memcpy(m_rfTalkerAlias + 6U + 7U, data, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "R"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo); @@ -689,9 +686,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK3)) { if (m_rfTalkerId == TALKER_ID_NONE) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias + 6U + 7U + 7U, data, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "R"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo); @@ -1426,9 +1423,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) case FLCO_TALKER_ALIAS_HEADER: if (!(m_netTalkerId & TALKER_ID_HEADER)) { if (!m_netTalkerId) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias, data + 2U, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "N"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data + 2U, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Header", m_slotNo); @@ -1441,9 +1438,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) case FLCO_TALKER_ALIAS_BLOCK1: if (!(m_netTalkerId & TALKER_ID_BLOCK1)) { if (!m_netTalkerId) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias + 7U, data + 2U, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "N"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data + 2U, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 1", m_slotNo); @@ -1456,9 +1453,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) case FLCO_TALKER_ALIAS_BLOCK2: if (!(m_netTalkerId & TALKER_ID_BLOCK2)) { if (!m_netTalkerId) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias + 7U + 7U, data + 2U, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "N"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data + 2U, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 2", m_slotNo); @@ -1471,9 +1468,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) case FLCO_TALKER_ALIAS_BLOCK3: if (!(m_netTalkerId & TALKER_ID_BLOCK3)) { if (!m_netTalkerId) - ::memset(m_rfTalkerAlias, '\0', 32U); - ::memcpy(m_rfTalkerAlias + 7U + 7U + 7U, data+2U, 7U); - m_display->writeDMRTA(m_slotNo, m_rfTalkerAlias, "N"); + m_rfTalkerAlias.reset(); + m_rfTalkerAlias.add(data+2U, 7U); + m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { ::sprintf(text, "DMR Slot %u, Embedded Talker Alias Block 3", m_slotNo); diff --git a/DMRSlot.h b/DMRSlot.h index ff00617..fc01e61 100644 --- a/DMRSlot.h +++ b/DMRSlot.h @@ -22,6 +22,7 @@ #include "RSSIInterpolator.h" #include "DMREmbeddedData.h" #include "DMRNetwork.h" +#include "DMRTA.h" #include "RingBuffer.h" #include "StopWatch.h" #include "DMRLookup.h" @@ -69,7 +70,7 @@ private: unsigned int m_rfEmbeddedReadN; unsigned int m_rfEmbeddedWriteN; unsigned char m_rfTalkerId; - unsigned char* m_rfTalkerAlias; + CDMRTA m_rfTalkerAlias; CDMREmbeddedData m_netEmbeddedLC; CDMREmbeddedData* m_netEmbeddedData; unsigned int m_netEmbeddedReadN; diff --git a/DMRTA.cpp b/DMRTA.cpp new file mode 100644 index 0000000..3dac506 --- /dev/null +++ b/DMRTA.cpp @@ -0,0 +1,111 @@ +/* +* Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX +* Copyright (C) 2018 by Shawn Chain, BG5HHP +* +* 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; version 2 of the License. +* +* 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. +*/ + +#include "DMRTA.h" +#include "Log.h" + +#include + +CDMRTA::CDMRTA() : +m_TA(), +m_buf(), +m_bufOffset(0) +{ +} + +CDMRTA::~CDMRTA() { +} + +bool CDMRTA::add(const unsigned char* data, unsigned int len) { + assert(data); + + if (m_bufOffset + len >= sizeof(m_buf)) { + // buffer overflow + reset(); + return false; + } + + ::memcpy(m_buf + m_bufOffset, data, len); + m_bufOffset += len; + + decodeTA(); + return true; +} + +const unsigned char* CDMRTA::get() { + return (unsigned char*)m_TA; +} + +void CDMRTA::reset() { + ::memset(m_TA, 0, sizeof(m_TA)); + ::memset(m_buf, 0, sizeof(m_buf)); + m_bufOffset = 0; +} + +void CDMRTA::decodeTA() { + unsigned char *b; + unsigned char c; + int j; + unsigned int i,t1,t2, TAsize, TAformat; + + unsigned char* talkerAlias = m_buf; + + TAformat=(talkerAlias[0]>>6U) & 0x03U; + TAsize = (talkerAlias[0]>>1U) & 0x1FU; + ::strncpy(m_TA, "(could not decode)", sizeof(m_TA)); + + switch (TAformat) { + case 0U: // 7 bit + ::memset(m_TA, 0, sizeof(m_TA)); + b=&talkerAlias[0]; + t1=0; t2=0; c=0; + for (i=0; (i<32U)&&(t2=0;j--) { + c = (c<<1U) | (b[i] >> j); + if (++t1==7U) { + if (i>0) { + m_TA[t2++]=c & 0x7FU; + } + t1=0; + c=0; + } + } + } + m_TA[TAsize]=0; + break; + case 1U: // ISO 8 bit + case 2U: // UTF8 + ::strncpy(m_TA,(char*)talkerAlias+1U, sizeof(m_TA)); + break; + case 3U: // UTF16 poor man's conversion + t2=0; + ::memset (&m_TA,0,sizeof(m_TA)); + for(i=0; (i<15)&&(t2TAsize) { + if (strlen(m_TA)<29U) + strcat(m_TA," ?"); + else + strcpy(m_TA+28U," ?"); + } +} \ No newline at end of file diff --git a/DMRTA.h b/DMRTA.h new file mode 100644 index 0000000..696f46e --- /dev/null +++ b/DMRTA.h @@ -0,0 +1,36 @@ +/* +* Copyright (C) 2015,2016,2017,2018 Jonathan Naylor, G4KLX +* Copyright (C) 2018 by Shawn Chain, BG5HHP +* +* 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; version 2 of the License. +* +* 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. +*/ + +#ifndef DMRTA_H +#define DMRTA_H + +class CDMRTA { +public: + CDMRTA(); + ~CDMRTA(); + + bool add(const unsigned char* data, unsigned int len); + const unsigned char* get(); + void reset(); + +protected: + void decodeTA(); + +private: + char m_TA[32]; + unsigned char m_buf[32]; + unsigned int m_bufOffset; +}; + +#endif diff --git a/Display.cpp b/Display.cpp index 1ee9b64..24f62f3 100644 --- a/Display.cpp +++ b/Display.cpp @@ -157,47 +157,8 @@ void CDisplay::writeDMRRSSI(unsigned int slotNo, unsigned char rssi) void CDisplay::writeDMRTA(unsigned int slotNo, unsigned char* talkerAlias, const char* type) { - char TA[32U]; - unsigned char *b; - unsigned char c; - int j; - unsigned int i,t1,t2, TAsize, TAformat; - - if (strcmp(type," ")==0) { writeDMRTAInt(slotNo, (unsigned char*)TA, type); return; } - - TAformat=(talkerAlias[0]>>6U) & 0x03U; - TAsize = (talkerAlias[0]>>1U) & 0x1FU; - ::strcpy(TA,"(could not decode)"); - switch (TAformat) { - case 0U: // 7 bit - ::memset (&TA,0,32U); - b=&talkerAlias[0]; - t1=0; t2=0; c=0; - for (i=0;(i<32U)&&(t2=0;j--) { - c = (c<<1U) | (b[i] >> j); - if (++t1==7U) { if (i>0) {TA[t2++]=c & 0x7FU; } t1=0; c=0; } - } - } - break; - case 1U: // ISO 8 bit - case 2U: // UTF8 - ::strcpy(TA,(char*)talkerAlias+1U); - break; - case 3U: // UTF16 poor man's conversion - t2=0; - ::memset (&TA,0,32U); - for(i=0;(i<15)&&(t2TAsize) { if (strlen(TA)<29U) strcat(TA," ?"); else strcpy(TA+28U," ?"); } - if (strlen((char*)TA)>=4U) writeDMRTAInt(slotNo, (unsigned char*)TA, type); - + if (strcmp(type," ")==0) { writeDMRTAInt(slotNo, (unsigned char*)"", type); return; } + if (strlen((char*)talkerAlias)>=4U) writeDMRTAInt(slotNo, (unsigned char*)talkerAlias, type); } void CDisplay::writeDMRBER(unsigned int slotNo, float ber) diff --git a/Makefile b/Makefile index e40ccea..537fa2e 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LDFLAGS = -g OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o \ NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o \ diff --git a/Makefile.Pi b/Makefile.Pi index 3a19521..2f5de8f 100644 --- a/Makefile.Pi +++ b/Makefile.Pi @@ -8,7 +8,7 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit index 2ffa9fb..fc6df16 100644 --- a/Makefile.Pi.Adafruit +++ b/Makefile.Pi.Adafruit @@ -8,7 +8,7 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780 index c70c081..1246297 100644 --- a/Makefile.Pi.HD44780 +++ b/Makefile.Pi.HD44780 @@ -8,7 +8,7 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED index 542b804..2c45165 100644 --- a/Makefile.Pi.OLED +++ b/Makefile.Pi.OLED @@ -8,7 +8,7 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574 index fc4a73e..30aaf24 100644 --- a/Makefile.Pi.PCF8574 +++ b/Makefile.Pi.PCF8574 @@ -8,7 +8,7 @@ LDFLAGS = -g -L/usr/local/lib OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \ NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \ NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \ diff --git a/Makefile.Solaris b/Makefile.Solaris index 6691d3e..b701271 100644 --- a/Makefile.Solaris +++ b/Makefile.Solaris @@ -8,7 +8,7 @@ LDFLAGS = -g OBJECTS = \ AMBEFEC.o BCH.o BPTC19696.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \ - DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ + DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \ DStarSlowData.o Golay2087.o Golay24128.o Hamming.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o \ NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \ NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o POCSAGNetwork.o \ From afdb36f7b688f42c5a0094940654f85eb5da6367 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 8 Dec 2018 20:24:05 +0000 Subject: [PATCH 11/15] Windows clean ups of the new DMR TA code. --- DMRTA.cpp | 71 ++++++++++++++++++++++----------------- MMDVMHost.vcxproj | 2 ++ MMDVMHost.vcxproj.filters | 6 ++++ 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/DMRTA.cpp b/DMRTA.cpp index 3dac506..8790842 100644 --- a/DMRTA.cpp +++ b/DMRTA.cpp @@ -16,6 +16,7 @@ #include "Log.h" #include +#include CDMRTA::CDMRTA() : m_TA(), @@ -24,11 +25,13 @@ m_bufOffset(0) { } -CDMRTA::~CDMRTA() { +CDMRTA::~CDMRTA() +{ } -bool CDMRTA::add(const unsigned char* data, unsigned int len) { - assert(data); +bool CDMRTA::add(const unsigned char* data, unsigned int len) +{ + assert(data != NULL); if (m_bufOffset + len >= sizeof(m_buf)) { // buffer overflow @@ -43,69 +46,75 @@ bool CDMRTA::add(const unsigned char* data, unsigned int len) { return true; } -const unsigned char* CDMRTA::get() { +const unsigned char* CDMRTA::get() +{ return (unsigned char*)m_TA; } -void CDMRTA::reset() { +void CDMRTA::reset() +{ ::memset(m_TA, 0, sizeof(m_TA)); ::memset(m_buf, 0, sizeof(m_buf)); m_bufOffset = 0; } -void CDMRTA::decodeTA() { +void CDMRTA::decodeTA() +{ unsigned char *b; unsigned char c; int j; - unsigned int i,t1,t2, TAsize, TAformat; + unsigned int i, t1, t2; unsigned char* talkerAlias = m_buf; - TAformat=(talkerAlias[0]>>6U) & 0x03U; - TAsize = (talkerAlias[0]>>1U) & 0x1FU; + unsigned int TAformat = (talkerAlias[0] >> 6U) & 0x03U; + unsigned int TAsize = (talkerAlias[0] >> 1U) & 0x1FU; ::strncpy(m_TA, "(could not decode)", sizeof(m_TA)); switch (TAformat) { case 0U: // 7 bit ::memset(m_TA, 0, sizeof(m_TA)); - b=&talkerAlias[0]; - t1=0; t2=0; c=0; - for (i=0; (i<32U)&&(t2=0;j--) { - c = (c<<1U) | (b[i] >> j); - if (++t1==7U) { - if (i>0) { - m_TA[t2++]=c & 0x7FU; - } - t1=0; - c=0; + b = &talkerAlias[0]; + t1 = 0U; t2 = 0U; c = 0U; + for (i = 0U; (i < 32U) && (t2 < TAsize); i++) { + for (j = 7; j >= 0; j--) { + c = (c << 1U) | (b[i] >> j); + if (++t1 == 7U) { + if (i > 0U) + m_TA[t2++] = c & 0x7FU; + + t1 = 0U; + c = 0U; } } } - m_TA[TAsize]=0; + m_TA[TAsize] = 0; break; + case 1U: // ISO 8 bit case 2U: // UTF8 - ::strncpy(m_TA,(char*)talkerAlias+1U, sizeof(m_TA)); + ::strncpy(m_TA, (char*)talkerAlias + 1U, sizeof(m_TA)); break; + case 3U: // UTF16 poor man's conversion t2=0; - ::memset (&m_TA,0,sizeof(m_TA)); - for(i=0; (i<15)&&(t2TAsize) { - if (strlen(m_TA)<29U) + + if (::strlen(m_TA) > TAsize) { + if (strlen(m_TA) < 29U) strcat(m_TA," ?"); else - strcpy(m_TA+28U," ?"); + strcpy(m_TA + 28U," ?"); } -} \ No newline at end of file +} diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj index 0491601..9092368 100644 --- a/MMDVMHost.vcxproj +++ b/MMDVMHost.vcxproj @@ -173,6 +173,7 @@ + @@ -264,6 +265,7 @@ + diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters index a91deba..0c595bf 100644 --- a/MMDVMHost.vcxproj.filters +++ b/MMDVMHost.vcxproj.filters @@ -281,6 +281,9 @@ Header Files + + Header Files + @@ -526,5 +529,8 @@ Source Files + + Source Files + \ No newline at end of file From 334307cd4a19775851db8fd0dab672d931a0fd24 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Sun, 9 Dec 2018 17:24:11 +0800 Subject: [PATCH 12/15] Bugfix of the DMRTA decoding for blocks comes in with random order --- DMRSlot.cpp | 16 ++++++++-------- DMRTA.cpp | 31 ++++++++++++++++++++++++------- DMRTA.h | 3 +-- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 2067570..4d0d8a1 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -630,7 +630,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_HEADER)) { if (m_rfTalkerId == TALKER_ID_NONE) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data, 6U); + m_rfTalkerAlias.add(0, data, 6U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { @@ -649,7 +649,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK1)) { if (m_rfTalkerId == TALKER_ID_NONE) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data, 7U); + m_rfTalkerAlias.add(1, data, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { @@ -668,7 +668,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK2)) { if (m_rfTalkerId == TALKER_ID_NONE) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data, 7U); + m_rfTalkerAlias.add(2, data, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { @@ -687,7 +687,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_BLOCK3)) { if (m_rfTalkerId == TALKER_ID_NONE) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data, 7U); + m_rfTalkerAlias.add(3, data, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { @@ -1424,7 +1424,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (!(m_netTalkerId & TALKER_ID_HEADER)) { if (!m_netTalkerId) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data + 2U, 7U); + m_rfTalkerAlias.add(0, data + 2U, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { @@ -1439,7 +1439,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (!(m_netTalkerId & TALKER_ID_BLOCK1)) { if (!m_netTalkerId) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data + 2U, 7U); + m_rfTalkerAlias.add(1, data + 2U, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { @@ -1454,7 +1454,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (!(m_netTalkerId & TALKER_ID_BLOCK2)) { if (!m_netTalkerId) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data + 2U, 7U); + m_rfTalkerAlias.add(2, data + 2U, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { @@ -1469,7 +1469,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) if (!(m_netTalkerId & TALKER_ID_BLOCK3)) { if (!m_netTalkerId) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(data+2U, 7U); + m_rfTalkerAlias.add(3, data+2U, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "N"); if (m_dumpTAData) { diff --git a/DMRTA.cpp b/DMRTA.cpp index 8790842..27e6955 100644 --- a/DMRTA.cpp +++ b/DMRTA.cpp @@ -20,8 +20,7 @@ CDMRTA::CDMRTA() : m_TA(), -m_buf(), -m_bufOffset(0) +m_buf() { } @@ -29,18 +28,37 @@ CDMRTA::~CDMRTA() { } -bool CDMRTA::add(const unsigned char* data, unsigned int len) +bool CDMRTA::add(unsigned int blockId, const unsigned char* data, unsigned int len) { assert(data != NULL); - if (m_bufOffset + len >= sizeof(m_buf)) { + unsigned int offset; + switch(blockId) { + case 0: + offset = 0; + break; + case 1: + offset = 6; + break; + case 2: + offset = 13; + break; + case 3: + offset = 20; + break; + default: + // invalid block id + reset(); + return false; + } + + if (offset + len >= sizeof(m_buf)) { // buffer overflow reset(); return false; } - ::memcpy(m_buf + m_bufOffset, data, len); - m_bufOffset += len; + ::memcpy(m_buf + offset, data, len); decodeTA(); return true; @@ -55,7 +73,6 @@ void CDMRTA::reset() { ::memset(m_TA, 0, sizeof(m_TA)); ::memset(m_buf, 0, sizeof(m_buf)); - m_bufOffset = 0; } void CDMRTA::decodeTA() diff --git a/DMRTA.h b/DMRTA.h index 696f46e..d5fb483 100644 --- a/DMRTA.h +++ b/DMRTA.h @@ -20,7 +20,7 @@ public: CDMRTA(); ~CDMRTA(); - bool add(const unsigned char* data, unsigned int len); + bool add(unsigned int blockId, const unsigned char* data, unsigned int len); const unsigned char* get(); void reset(); @@ -30,7 +30,6 @@ protected: private: char m_TA[32]; unsigned char m_buf[32]; - unsigned int m_bufOffset; }; #endif From 4ee8dc9deedda1cbd2e74590c8265e5fc6021e93 Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Sun, 9 Dec 2018 23:49:15 +0800 Subject: [PATCH 13/15] Fixed incorrect DMRTA header packet length from RF side --- DMRSlot.cpp | 2 +- DMRTA.cpp | 39 ++++++++++++++------------------------- DMRTA.h | 2 +- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 4d0d8a1..a26da2d 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -630,7 +630,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (!(m_rfTalkerId & TALKER_ID_HEADER)) { if (m_rfTalkerId == TALKER_ID_NONE) m_rfTalkerAlias.reset(); - m_rfTalkerAlias.add(0, data, 6U); + m_rfTalkerAlias.add(0, data, 7U); m_display->writeDMRTA(m_slotNo, (unsigned char*)m_rfTalkerAlias.get(), "R"); if (m_dumpTAData) { diff --git a/DMRTA.cpp b/DMRTA.cpp index 27e6955..bf074aa 100644 --- a/DMRTA.cpp +++ b/DMRTA.cpp @@ -31,27 +31,14 @@ CDMRTA::~CDMRTA() bool CDMRTA::add(unsigned int blockId, const unsigned char* data, unsigned int len) { assert(data != NULL); - - unsigned int offset; - switch(blockId) { - case 0: - offset = 0; - break; - case 1: - offset = 6; - break; - case 2: - offset = 13; - break; - case 3: - offset = 20; - break; - default: - // invalid block id - reset(); - return false; + if (blockId > 3) { + // invalid block id + reset(); + return false; } + unsigned int offset = blockId * 7; + if (offset + len >= sizeof(m_buf)) { // buffer overflow reset(); @@ -60,8 +47,7 @@ bool CDMRTA::add(unsigned int blockId, const unsigned char* data, unsigned int l ::memcpy(m_buf + offset, data, len); - decodeTA(); - return true; + return decodeTA(); } const unsigned char* CDMRTA::get() @@ -75,7 +61,7 @@ void CDMRTA::reset() ::memset(m_buf, 0, sizeof(m_buf)); } -void CDMRTA::decodeTA() +bool CDMRTA::decodeTA() { unsigned char *b; unsigned char c; @@ -126,12 +112,15 @@ void CDMRTA::decodeTA() break; } - LogMessage("DMR Talker Alias (Data Format %u, Received %u/%u char): '%s'", TAformat, ::strlen(m_TA), TAsize, m_TA); + size_t TAlen = ::strlen(m_TA); + LogMessage("DMR Talker Alias (Data Format %u, Received %u/%u char): '%s'", TAformat, TAlen, TAsize, m_TA); - if (::strlen(m_TA) > TAsize) { - if (strlen(m_TA) < 29U) + if (TAlen > TAsize) { + if (TAlen < 29U) strcat(m_TA," ?"); else strcpy(m_TA + 28U," ?"); } + + return TAlen >= TAsize; } diff --git a/DMRTA.h b/DMRTA.h index d5fb483..d53f93f 100644 --- a/DMRTA.h +++ b/DMRTA.h @@ -25,7 +25,7 @@ public: void reset(); protected: - void decodeTA(); + bool decodeTA(); private: char m_TA[32]; From e1f3567d089578172d4240e37564f57accede664 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 10 Dec 2018 14:22:44 -0300 Subject: [PATCH 14/15] Set POCSAG frequency when POCSAG is enabled --- Modem.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Modem.cpp b/Modem.cpp index 8df71cf..ae7ca76 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -1531,16 +1531,20 @@ bool CModem::setFrequency() unsigned char buffer[20U]; unsigned char len; + unsigned int pocsagFrequency = 433000000U; + + if (m_pocsagEnabled) + pocsagFrequency = m_pocsagFrequency; if (m_hwType == HWT_DVMEGA) len = 12U; else { buffer[12U] = (unsigned char)(m_rfLevel * 2.55F + 0.5F); - buffer[13U] = (m_pocsagFrequency >> 0) & 0xFFU; - buffer[14U] = (m_pocsagFrequency >> 8) & 0xFFU; - buffer[15U] = (m_pocsagFrequency >> 16) & 0xFFU; - buffer[16U] = (m_pocsagFrequency >> 24) & 0xFFU; + buffer[13U] = (pocsagFrequency >> 0) & 0xFFU; + buffer[14U] = (pocsagFrequency >> 8) & 0xFFU; + buffer[15U] = (pocsagFrequency >> 16) & 0xFFU; + buffer[16U] = (pocsagFrequency >> 24) & 0xFFU; len = 17U; } From 0da6167c6175af2a027b69d66e1e9aaf204cef64 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 9 Jan 2019 03:02:51 +0000 Subject: [PATCH 15/15] readd missing constants and missing FEC code from previous revert; --- P25Control.cpp | 2 +- P25Control.h | 2 +- P25Data.cpp | 2 +- P25Data.h | 2 +- P25Defines.h | 2 + RS241213.cpp | 283 ++++++++++++++++++++++++++++++++++--------------- RS241213.h | 6 ++ 7 files changed, 210 insertions(+), 89 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index 7e92ead..6e87506 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 diff --git a/P25Control.h b/P25Control.h index 0845a02..43af0eb 100644 --- a/P25Control.h +++ b/P25Control.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 diff --git a/P25Data.cpp b/P25Data.cpp index 7bc08cd..6b24666 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 diff --git a/P25Data.h b/P25Data.h index 999155c..026c5c4 100644 --- a/P25Data.h +++ b/P25Data.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 diff --git a/P25Defines.h b/P25Defines.h index 6ceda75..815f75a 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -55,6 +55,8 @@ const unsigned int P25_PDU_FEC_LENGTH_BITS = P25_PDU_FEC_LENGTH_BYTES const unsigned int P25_MI_LENGTH_BYTES = 9U; +const unsigned char P25_ALGO_UNENCRYPT = 0x80U; + const unsigned char P25_LCF_GROUP = 0x00U; const unsigned char P25_LCF_PRIVATE = 0x03U; diff --git a/RS241213.cpp b/RS241213.cpp index 3e929d0..246da00 100644 --- a/RS241213.cpp +++ b/RS241213.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 @@ -20,6 +21,7 @@ #include #include +#include const unsigned char ENCODE_MATRIX[12U][24U] = { {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 062, 044, 003, 025, 014, 016, 027, 003, 053, 004, 036, 047}, @@ -35,6 +37,46 @@ const unsigned char ENCODE_MATRIX[12U][24U] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 073, 065, 036, 061, 042, 022, 017, 004, 044, 020, 025, 005}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 071, 005, 055, 003, 071, 034, 060, 011, 074, 002, 041, 050}}; +const unsigned char ENCODE_MATRIX_24169[16U][24U] = { + { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 051, 045, 067, 015, 064, 067, 052, 012 }, + { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 057, 025, 063, 073, 071, 022, 040, 015 }, + { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 005, 001, 031, 004, 016, 054, 025, 076 }, + { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 073, 007, 047, 014, 041, 077, 047, 011 }, + { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 075, 015, 051, 051, 017, 067, 017, 057 }, + { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 020, 032, 014, 042, 075, 042, 070, 054 }, + { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 002, 075, 043, 005, 001, 040, 012, 064 }, + { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 024, 074, 015, 072, 024, 026, 074, 061 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 042, 064, 007, 022, 061, 020, 040, 065 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 032, 032, 055, 041, 057, 066, 021, 077 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 065, 036, 025, 007, 050, 016, 040, 051 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 064, 006, 054, 032, 076, 046, 014, 036 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 062, 063, 074, 070, 005, 027, 037, 046 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 055, 043, 034, 071, 057, 076, 050, 064 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 024, 023, 023, 005, 050, 070, 042, 023 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 067, 075, 045, 060, 057, 024, 006, 026 } }; + +const unsigned char ENCODE_MATRIX_362017[20U][36U] = { + { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 037, 034, 006, 002, 007, 044, 064, 026, 014, 026, 044, 054, 013, 077, 005 }, + { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 004, 017, 050, 024, 011, 005, 030, 057, 033, 003, 002, 002, 015, 016, 025, 026 }, + { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 007, 023, 037, 046, 056, 075, 043, 045, 055, 021, 050, 031, 045, 027, 071, 062 }, + { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 026, 005, 007, 063, 063, 027, 063, 040, 006, 004, 040, 045, 047, 030, 075, 007 }, + { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 023, 073, 073, 041, 072, 034, 021, 051, 067, 016, 031, 074, 011, 021, 012, 021 }, + { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 024, 051, 025, 023, 022, 041, 074, 066, 074, 065, 070, 036, 067, 045, 064, 001 }, + { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 052, 033, 014, 002, 020, 006, 014, 025, 052, 023, 035, 074, 075, 075, 043, 027 }, + { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 055, 062, 056, 025, 073, 060, 015, 030, 013, 017, 020, 002, 070, 055, 014, 047 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 051, 032, 065, 077, 012, 054, 013, 035, 032, 056, 012, 075, 001, 072, 063 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 041, 030, 041, 043, 022, 051, 006, 064, 033, 003, 047, 027, 012, 055, 047 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 070, 011, 003, 013, 022, 016, 057, 003, 045, 072, 031, 030, 056, 035, 022 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 051, 007, 072, 030, 065, 054, 006, 021, 036, 063, 050, 061, 064, 052, 001, 060 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 001, 065, 032, 070, 013, 044, 073, 024, 012, 052, 021, 055, 012, 035, 014, 072 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 011, 070, 005, 010, 065, 024, 015, 077, 022, 024, 024, 074, 007, 044, 007, 046 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 006, 002, 065, 011, 041, 020, 045, 042, 046, 054, 035, 012, 040, 064, 065, 033 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 034, 031, 001, 015, 044, 064, 016, 024, 052, 016, 006, 062, 020, 013, 055, 057 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 063, 043, 025, 044, 077, 063, 017, 017, 064, 014, 040, 074, 031, 072, 054, 006 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 071, 021, 070, 044, 056, 004, 030, 074, 004, 023, 071, 070, 063, 045, 056, 043 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 002, 001, 053, 074, 002, 014, 052, 074, 012, 057, 024, 063, 015, 042, 052, 033 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 034, 035, 002, 023, 021, 027, 022, 033, 064, 042, 005, 073, 051, 046, 073, 060 } }; + const unsigned int rsGFexp[64] = { 1, 2, 4, 8, 16, 32, 3, 6, 12, 24, 48, 35, 5, 10, 20, 40, 19, 38, 15, 30, 60, 59, 53, 41, 17, 34, 7, 14, 28, 56, 51, 37, @@ -85,21 +127,121 @@ CRS241213::~CRS241213() } bool CRS241213::decode(unsigned char* data) +{ + return decode(data, 24U, 39, 12); +} + +void CRS241213::encode(unsigned char* data) { assert(data != NULL); - unsigned char HB[24U]; + unsigned char codeword[24U]; + + for (unsigned int i = 0U; i < 24U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); + } + } unsigned int offset = 0U; for (unsigned int i = 0U; i < 24U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +bool CRS241213::decode24169(unsigned char* data) +{ + return decode(data, 24U, 39, 8); +} + +void CRS241213::encode24169(unsigned char* data) +{ + assert(data != NULL); + + unsigned char codeword[24U]; + + for (unsigned int i = 0U; i < 24U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 16U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_24169[j][i]); + } + } + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < 24U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +bool CRS241213::decode362017(unsigned char* data) +{ + return decode(data, 36U, 27, 16); +} + +void CRS241213::encode362017(unsigned char* data) +{ + assert(data != NULL); + + unsigned char codeword[36U]; + + for (unsigned int i = 0U; i < 36U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 20U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_362017[j][i]); + } + } + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < 36U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +// GF(2 ^ 6) multiply(for Reed - Solomon encoder) +unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const +{ + unsigned char p = 0x00U; + + for (unsigned int i = 0U; i < 6U; i++) { + if ((b & 0x01U) == 0x01U) + p ^= a; + + a <<= 1; + + if ((a & 0x40U) == 0x40U) + a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 + + b >>= 1; + } + + return p; +} + +bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots) +{ + assert(data != NULL); + + //unsigned char HB[24U]; + unsigned char HB[63U]; + ::memset(HB, 0x00U, 63U); + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < bitLength; i++, offset += 6) HB[i] = bin2Hex(data, offset); //RS (63,63-nroots,nroots+1) decoder where nroots = number of parity bits // rsDec(8, 39) rsDec(16, 27) rsDec(12, 39) - const int nroots = 12; - int lambda[18];//Err+Eras Locator poly - int S[17];//syndrome poly + const int nroots = roots; + int lambda[18]; // Err+Eras Locator poly + int S[17]; // syndrome poly int b[18]; int t[18]; int omega[18]; @@ -109,22 +251,25 @@ bool CRS241213::decode(unsigned char* data) int i, j, count, r, el, SynError, DiscrR, q, DegOmega, tmp, num1, num2, den, DegLambda; - //form the syndromes; i.e., evaluate HB(x) at roots of g(x) + // form the syndromes; i.e., evaluate HB(x) at roots of g(x) for (i = 0; i <= nroots - 1; i++) { S[i] = HB[0]; } - for (j = 1; j <= 23; j++) { // XXX was 62 + //for (j = 1; j <= 24; j++) { // XXX was 62 + //for (j = 1; j <= (int)(bitLength - 1); j++) { + for (j = 1; j <= 62; j++) { for (i = 0; i <= nroots - 1; i++) { if (S[i] == 0) { S[i] = HB[j]; - } else { + } + else { S[i] = HB[j] ^ rsGFexp[(rsGFlog[S[i]] + i + 1) % 63]; } } } - //convert syndromes to index form, checking for nonzero condition + // convert syndromes to index form, checking for nonzero condition SynError = 0; for (i = 0; i <= nroots - 1; i++) { @@ -133,8 +278,8 @@ bool CRS241213::decode(unsigned char* data) } if (SynError == 0) { - //if syndrome is zero, rsData[] is a codeword and there are - //no errors to correct. So return rsData[] unmodified + // if syndrome is zero, rsData[] is a codeword and there are + // no errors to correct. So return rsData[] unmodified count = 0; return true; } @@ -149,13 +294,14 @@ bool CRS241213::decode(unsigned char* data) b[i] = rsGFlog[lambda[i]]; } - //begin Berlekamp-Massey algorithm to determine error+erasure - //locator polynomial + // begin Berlekamp-Massey algorithm to determine error+erasure + // locator polynomial r = 0; el = 0; - while (r < nroots) { //r is the step number - r = r + 1; - //compute discrepancy at the r-th step in poly-form + while (++r <= nroots) { + // r is the step number + //r = r + 1; + // compute discrepancy at the r-th step in poly-form DiscrR = 0; for (i = 0; i <= r - 1; i++) { @@ -164,44 +310,48 @@ bool CRS241213::decode(unsigned char* data) } } - DiscrR = rsGFlog[DiscrR];//index form + DiscrR = rsGFlog[DiscrR]; // index form if (DiscrR == 63) { - //shift elements upward one step + // shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } b[0] = 63; - } else { - //t(x) <-- lambda(x) - DiscrR*x*b(x) + } + else { + // t(x) <-- lambda(x) - DiscrR*x*b(x) t[0] = lambda[0]; - + for (i = 0; i <= nroots - 1; i++) { if (b[i] != 63) { t[i + 1] = lambda[i + 1] ^ rsGFexp[(DiscrR + b[i]) % 63]; - } else { + } + else { t[i + 1] = lambda[i + 1]; } } - + if (2 * el <= r - 1) { el = r - el; - //b(x) <-- inv(DiscrR) * lambda(x) + // b(x) <-- inv(DiscrR) * lambda(x) for (i = 0; i <= nroots; i++) { if (lambda[i]) { b[i] = (rsGFlog[lambda[i]] - DiscrR + 63) % 63; - } else { + } + else { b[i] = 63; } } - } else { - //shift elements upward one step + } + else { + // shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } - + b[0] = 63; } @@ -209,9 +359,9 @@ bool CRS241213::decode(unsigned char* data) lambda[i] = t[i]; } } - } /* end while() */ + } /* end while() */ - //convert lambda to index form and compute deg(lambda(x)) + // convert lambda to index form and compute deg(lambda(x)) DegLambda = 0; for (i = 0; i <= nroots; i++) { lambda[i] = rsGFlog[lambda[i]]; @@ -221,16 +371,16 @@ bool CRS241213::decode(unsigned char* data) } } - //Find roots of the error+erasure locator polynomial by Chien search + // Find roots of the error+erasure locator polynomial by Chien search for (i = 1; i <= nroots; i++) { reg[i] = lambda[i]; } - count = 0;//number of roots of lambda(x) + count = 0;// number of roots of lambda(x) for (i = 1; i <= 63; i++) { - q = 1;//lambda[0] is always 0 - + q = 1;// lambda[0] is always 0 + for (j = DegLambda; j >= 1; j += -1) { if (reg[j] != 63) { reg[j] = (reg[j] + j) % 63; @@ -238,13 +388,14 @@ bool CRS241213::decode(unsigned char* data) } } - if (q == 0) { //it is a root - //store root (index-form) and error location number + // it is a root + if (q == 0) { + // store root (index-form) and error location number root[count] = i; locn[count] = i - 40; - //if wehave max possible roots, abort search to save time + // if we have max possible roots, abort search to save time count = count + 1; - + if (count == DegLambda) { break; } @@ -252,18 +403,19 @@ bool CRS241213::decode(unsigned char* data) } if (DegLambda != count) { - //deg(lambda) unequal to number of roots => uncorrectable error detected + // deg(lambda) unequal to number of roots => uncorrectable error detected return false; } - //compute err+eras evaluator poly omega(x) + // compute err+eras evaluator poly omega(x) // = s(x)*lambda(x) (modulo x**nroots). in index form. Also find deg(omega). DegOmega = 0; for (i = 0; i <= nroots - 1; i++) { tmp = 0; if (DegLambda < i) { j = DegLambda; - } else { + } + else { j = i; } @@ -301,7 +453,8 @@ bool CRS241213::decode(unsigned char* data) // lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] if (DegLambda < nroots) { i = DegLambda; - } else { + } + else { i = nroots; } @@ -317,55 +470,15 @@ bool CRS241213::decode(unsigned char* data) // apply error to data if (num1 != 0) { - if(locn[j] < 24) - HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); + if (locn[j] < firstData) + return false; + HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); } } offset = 0U; - for (unsigned int i = 0U; i < 12U; i++, offset += 6U) + for (unsigned int i = 0U; i < (unsigned int)nroots; i++, offset += 6) hex2Bin(HB[i], data, offset); return true; } - -void CRS241213::encode(unsigned char* data) -{ - assert(data != NULL); - - unsigned char codeword[24U]; - - for (unsigned int i = 0U; i < 24U; i++) { - codeword[i] = 0x00U; - - unsigned int offset = 0U; - for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { - unsigned char hexbit = bin2Hex(data, offset); - codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); - } - } - - unsigned int offset = 0U; - for (unsigned int i = 0U; i < 24U; i++, offset += 6U) - hex2Bin(codeword[i], data, offset); -} - -// GF(2 ^ 6) multiply(for Reed - Solomon encoder) -unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const -{ - unsigned char p = 0x00U; - - for (unsigned int i = 0U; i < 6U; i++) { - if ((b & 0x01U) == 0x01U) - p ^= a; - - a <<= 1; - - if ((a & 0x40U) == 0x40U) - a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 - - b >>= 1; - } - - return p; -} diff --git a/RS241213.h b/RS241213.h index fe3171a..dcbeeed 100644 --- a/RS241213.h +++ b/RS241213.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * 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 @@ -26,11 +27,16 @@ public: ~CRS241213(); bool decode(unsigned char* data); + bool decode24169(unsigned char* data); + bool decode362017(unsigned char* data); void encode(unsigned char* data); + void encode24169(unsigned char* data); + void encode362017(unsigned char* data); private: unsigned char gf6Mult(unsigned char a, unsigned char b) const; + bool decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots); }; #endif