From 5448a5d8d97f2a0004b1e2f0a71b375bdaf691b0 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 29 Feb 2016 19:52:11 +0000 Subject: [PATCH] Work on V/D Mode 2. --- YSFControl.cpp | 25 +++---- YSFControl.h | 2 + YSFPayload.cpp | 179 +++++++++++++++++++++++++++++++++++++++++++++---- YSFPayload.h | 12 ++++ 4 files changed, 187 insertions(+), 31 deletions(-) diff --git a/YSFControl.cpp b/YSFControl.cpp index 7fdd208..0670dce 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -12,7 +12,6 @@ */ #include "YSFControl.h" -#include "YSFPayload.h" #include "Utils.h" #include "Sync.h" #include "Log.h" @@ -37,6 +36,7 @@ m_state(RS_RF_LISTENING), m_timeoutTimer(1000U, timeout), m_frames(0U), m_fich(), +m_payload(), m_parrot(NULL), m_fp(NULL) { @@ -44,6 +44,9 @@ m_fp(NULL) if (parrot) m_parrot = new CYSFParrot(timeout); + + m_payload.setUplink(callsign); + m_payload.setDownlink(callsign); } CYSFControl::~CYSFControl() @@ -99,9 +102,8 @@ bool CYSFControl::writeModem(unsigned char *data) LogMessage("YSF, EOT, FI=%X BN=%u BT=%u FN=%u FT=%u DT=%X", fich.getFI(), fich.getBN(), fich.getBT(), fich.getFN(), fich.getFT(), fich.getDT()); - CYSFPayload payload; - payload.decode(data + 2U, fi, fn, ft, dt); - payload.encode(data + 2U); + m_payload.decode(data + 2U, fi, fn, ft, dt); + // m_payload.encode(data + 2U); m_frames++; @@ -146,18 +148,8 @@ bool CYSFControl::writeModem(unsigned char *data) m_fich.setFI(0x01U); // Communication channel unsigned char fn = m_fich.getFN(); - unsigned char ft = m_fich.getFT(); - - fn++; - if (fn >= 8U) { - fn = 0U; - ft++; - if (ft >= 8U) - ft = 0U; - } - + fn = (fn + 1U) % 8U; m_fich.setFN(fn); - m_fich.setFT(ft); } unsigned char fi = m_fich.getFI(); @@ -165,8 +157,7 @@ bool CYSFControl::writeModem(unsigned char *data) unsigned char ft = m_fich.getFT(); unsigned char dt = m_fich.getDT(); - CYSFPayload payload; - payload.decode(data + 2U, fi, fn, ft, dt); + m_payload.decode(data + 2U, fi, fn, ft, dt); // payload.encode(data + 2U); m_frames++; diff --git a/YSFControl.h b/YSFControl.h index 97e8a7a..960c68e 100644 --- a/YSFControl.h +++ b/YSFControl.h @@ -20,6 +20,7 @@ #define YSFControl_H #include "YSFDefines.h" +#include "YSFPayload.h" #include "RingBuffer.h" #include "YSFParrot.h" #include "Display.h" @@ -49,6 +50,7 @@ private: CTimer m_timeoutTimer; unsigned int m_frames; CYSFFICH m_fich; + CYSFPayload m_payload; CYSFParrot* m_parrot; FILE* m_fp; diff --git a/YSFPayload.cpp b/YSFPayload.cpp index 27120f9..05fb5a3 100644 --- a/YSFPayload.cpp +++ b/YSFPayload.cpp @@ -66,13 +66,20 @@ const unsigned int INTERLEAVE_TABLE_5_20[] = { 36U, 76U, 116U, 156U, 196U, 38U, 78U, 118U, 158U, 198U}; +const unsigned char WHITENING_DATA[] = {0x93U, 0xD7U, 0x51U, 0x21U, 0x9CU, 0x2FU, 0x6CU, 0xD0U, 0xEFU, 0x0FU, + 0xF8U, 0x3DU, 0xF1U, 0x73U, 0x20U, 0x94U, 0xEDU, 0x1EU, 0x7CU, 0xD8U}; + const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U}; #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7]) #define READ_BIT1(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) CYSFPayload::CYSFPayload() : -m_data(NULL) +m_data(NULL), +m_uplink(NULL), +m_downlink(NULL), +m_source(NULL), +m_dest(NULL) { m_data = new unsigned char[90U]; } @@ -80,6 +87,8 @@ m_data(NULL) CYSFPayload::~CYSFPayload() { delete[] m_data; + delete[] m_uplink; + delete[] m_downlink; } bool CYSFPayload::decode(const unsigned char* bytes, unsigned char fi, unsigned char fn, unsigned char ft, unsigned char dt) @@ -148,8 +157,12 @@ bool CYSFPayload::decodeHeader() conv.chainback(output1, 176U); bool ret1 = CCRC::checkCCITT162(output1, 22U); - if (ret1) - CUtils::dump("Header/Trailer, valid DCH1", output1, 22U); + if (ret1) { + for (unsigned int i = 0U; i < 20U; i++) + output1[i] ^= WHITENING_DATA[i]; + + CUtils::dump("Header/Trailer, valid DCH1", output1, 20U); + } conv.start(); @@ -169,8 +182,12 @@ bool CYSFPayload::decodeHeader() bool ret2 = CCRC::checkCCITT162(output2, 22U); - if (ret2) - CUtils::dump("Header/Trailer, valid DCH2", output2, 22U); + if (ret2) { + for (unsigned int i = 0U; i < 20U; i++) + output2[i] ^= WHITENING_DATA[i]; + + CUtils::dump("Header/Trailer, valid DCH2", output2, 20U); + } return true; } @@ -204,8 +221,12 @@ bool CYSFPayload::decodeVDMode1(unsigned char fn, unsigned char ft) conv.chainback(output, 176U); bool ret = CCRC::checkCCITT162(output, 22U); - if (ret) - CUtils::dump("V/D Mode 1, valid DCH", output, 22U); + if (ret) { + for (unsigned int i = 0U; i < 20U; i++) + output[i] ^= WHITENING_DATA[i]; + + CUtils::dump("V/D Mode 1, valid DCH", output, 20U); + } return true; } @@ -239,8 +260,79 @@ bool CYSFPayload::decodeVDMode2(unsigned char fn, unsigned char ft) conv.chainback(output, 96U); bool ret = CCRC::checkCCITT162(output, 12U); - if (ret) - CUtils::dump("V/D Mode 2, valid DCH", output, 12U); + if (ret) { + for (unsigned int i = 0U; i < 10U; i++) + output[i] ^= WHITENING_DATA[i]; + + switch (fn) { + case 0U: + CUtils::dump("V/D Mode 2, Destination", output, 10U); + if (m_dest == NULL) + m_dest = new unsigned char[10U]; + ::memcpy(m_dest, output, 10U); + break; + case 1U: + CUtils::dump("V/D Mode 2, Source", output, 10U); + if (m_source == NULL) + m_source = new unsigned char[10U]; + ::memcpy(m_source, output, 10U); + break; + case 4U: + CUtils::dump("V/D Mode 2, Rem 1+2", output, 10U); + break; + case 5U: + CUtils::dump("V/D Mode 2, Rem 3+4", output, 10U); + break; + default: + break; + } + } + + if (fn == 2U && m_downlink != NULL) { + for (unsigned int i = 0U; i < 10U; i++) + output[i] = WHITENING_DATA[i] ^ m_downlink[i]; + ret = true; + } + + if (fn == 3U && m_uplink != NULL) { + for (unsigned int i = 0U; i < 10U; i++) + output[i] = WHITENING_DATA[i] ^ m_uplink[i]; + ret = true; + } + + // Data is corrupt so don't try and regenerate it + if (!ret) + return false; + + CCRC::addCCITT162(output, 12U); + output[12U] = 0x00U; + + unsigned char convolved[25U]; + conv.encode(output, convolved, 100U); + + unsigned char bytes[25U]; + unsigned int j = 0U; + for (unsigned int i = 0U; i < 100U; i++) { + unsigned int n = INTERLEAVE_TABLE_5_20[i]; + + bool s0 = READ_BIT1(convolved, j) != 0U; + j++; + + bool s1 = READ_BIT1(convolved, j) != 0U; + j++; + + WRITE_BIT1(bytes, n, s0); + + n++; + WRITE_BIT1(bytes, n, s1); + } + + p1 = m_data; + p2 = bytes; + for (unsigned int i = 0U; i < 5U; i++) { + ::memcpy(p1, p2, 5U); + p1 += 18U; p2 += 5U; + } return true; } @@ -278,8 +370,12 @@ bool CYSFPayload::decodeDataFRMode(unsigned char fn, unsigned char ft) conv.chainback(output1, 176U); bool ret1 = CCRC::checkCCITT162(output1, 22U); - if (ret1) - CUtils::dump("Data FR Mode, valid DCH1", output1, 22U); + if (ret1) { + for (unsigned int i = 0U; i < 20U; i++) + output1[i] ^= WHITENING_DATA[i]; + + CUtils::dump("Data FR Mode, valid DCH1", output1, 20U); + } conv.start(); @@ -297,10 +393,65 @@ bool CYSFPayload::decodeDataFRMode(unsigned char fn, unsigned char ft) unsigned char output2[23U]; conv.chainback(output2, 176U); - bool ret2 = CCRC::checkCCITT162(output2, 22U); - if (ret2) - CUtils::dump("Data FR Mode, valid DCH2", output2, 22U); + if (ret2) { + for (unsigned int i = 0U; i < 20U; i++) + output2[i] ^= WHITENING_DATA[i]; + + CUtils::dump("Data FR Mode, valid DCH2", output2, 20U); + } + + return true; +} + +void CYSFPayload::setUplink(const std::string& callsign) +{ + m_uplink = new unsigned char[10U]; + + std::string uplink = callsign; + uplink.resize(10U, ' '); + + for (unsigned int i = 0U; i < 10U; i++) + m_uplink[i] = uplink.at(i); +} + +void CYSFPayload::setDownlink(const std::string& callsign) +{ + m_downlink = new unsigned char[10U]; + + std::string downlink = callsign; + downlink.resize(10U, ' '); + + for (unsigned int i = 0U; i < 10U; i++) + m_downlink[i] = downlink.at(i); +} + +bool CYSFPayload::getSource(unsigned char* callsign) +{ + assert(callsign != NULL); + + if (m_source == NULL) + return false; + + ::memcpy(callsign, m_source, 10U); + + delete[] m_source; + m_source = NULL; + + return true; +} + +bool CYSFPayload::getDest(unsigned char* callsign) +{ + assert(callsign != NULL); + + if (m_dest == NULL) + return false; + + ::memcpy(callsign, m_dest, 10U); + + delete[] m_dest; + m_dest = NULL; return true; } diff --git a/YSFPayload.h b/YSFPayload.h index 282351c..afa6f0f 100644 --- a/YSFPayload.h +++ b/YSFPayload.h @@ -19,6 +19,8 @@ #if !defined(YSFPayload_H) #define YSFPayload_H +#include + class CYSFPayload { public: CYSFPayload(); @@ -28,8 +30,18 @@ public: void encode(unsigned char* bytes); + bool getSource(unsigned char* callsign); + bool getDest(unsigned char* callsign); + + void setUplink(const std::string& callsign); + void setDownlink(const std::string& callsign); + private: unsigned char* m_data; + unsigned char* m_uplink; + unsigned char* m_downlink; + unsigned char* m_source; + unsigned char* m_dest; bool decodeHeader(); bool decodeVDMode1(unsigned char fn, unsigned char ft);