From a6affb765e0d4037c8639384c3bffcb09e74657c Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 21 Feb 2017 17:51:09 +0000 Subject: [PATCH] Remove the sync sample dumping. --- DMRDMORX.cpp | 28 +--------------------------- DMRDMORX.h | 1 - DMRSlotRX.cpp | 23 +---------------------- DMRSlotRX.h | 1 - P25RX.cpp | 26 +------------------------- P25RX.h | 1 - SerialPort.cpp | 26 +------------------------- SerialPort.h | 1 - YSFRX.cpp | 23 +---------------------- YSFRX.h | 1 - 10 files changed, 5 insertions(+), 126 deletions(-) diff --git a/DMRDMORX.cpp b/DMRDMORX.cpp index aff6ef3..32b43ff 100644 --- a/DMRDMORX.cpp +++ b/DMRDMORX.cpp @@ -18,8 +18,7 @@ #define WANT_DEBUG -// #define DUMP_SYNC_SAMPLES -#define DUMP_SAMPLES +// #define DUMP_SAMPLES #include "Config.h" #include "Globals.h" @@ -130,10 +129,6 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) ptr -= DMO_BUFFER_LENGTH_SAMPLES; samplesToBits(ptr, DMR_FRAME_LENGTH_SYMBOLS, frame, 8U, centre, threshold); -#if defined(DUMP_SYNC_SAMPLES) - if (m_control == CONTROL_DATA || m_control == CONTROL_VOICE) - writeSyncSamples(); -#endif #if defined(DUMP_SAMPLES) if (m_control == CONTROL_DATA || m_control == CONTROL_VOICE) writeSamples(ptr); @@ -437,27 +432,6 @@ void CDMRDMORX::writeRSSIData(uint8_t* frame) #endif } -#if defined(DUMP_SYNC_SAMPLES) -void CDMRDMORX::writeSyncSamples() -{ - uint16_t ptr = m_syncPtr + DMO_BUFFER_LENGTH_SAMPLES - DMR_SYNC_LENGTH_SAMPLES + DMR_RADIO_SYMBOL_LENGTH; - if (ptr >= DMO_BUFFER_LENGTH_SAMPLES) - ptr -= DMO_BUFFER_LENGTH_SAMPLES; - - q15_t sync[DMR_SYNC_LENGTH_SYMBOLS]; - - for (uint16_t i = 0U; i < DMR_SYNC_LENGTH_SYMBOLS; i++) { - sync[i] = m_buffer[ptr]; - - ptr += DMR_RADIO_SYMBOL_LENGTH; - if (ptr >= DMO_BUFFER_LENGTH_SAMPLES) - ptr -= DMO_BUFFER_LENGTH_SAMPLES; - } - - serial.writeSyncSamples(STATE_DMR, sync, DMR_SYNC_LENGTH_SYMBOLS); -} -#endif - #if defined(DUMP_SAMPLES) void CDMRDMORX::writeSamples(uint16_t start) { diff --git a/DMRDMORX.h b/DMRDMORX.h index 74803d2..7ec766c 100644 --- a/DMRDMORX.h +++ b/DMRDMORX.h @@ -64,7 +64,6 @@ private: void correlateSync(bool first); void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); void writeRSSIData(uint8_t* frame); - void writeSyncSamples(); void writeSamples(uint16_t start); }; diff --git a/DMRSlotRX.cpp b/DMRSlotRX.cpp index 812d86c..3bb0482 100644 --- a/DMRSlotRX.cpp +++ b/DMRSlotRX.cpp @@ -18,8 +18,7 @@ #define WANT_DEBUG -// #define DUMP_SYNC_SAMPLES -#define DUMP_SAMPLES +// #define DUMP_SAMPLES #include "Config.h" #include "Globals.h" @@ -133,10 +132,6 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) uint16_t ptr = m_endPtr - DMR_FRAME_LENGTH_SAMPLES + DMR_RADIO_SYMBOL_LENGTH + 1U; samplesToBits(ptr, DMR_FRAME_LENGTH_SYMBOLS, frame, 8U, centre, threshold); -#if defined(DUMP_SYNC_SAMPLES) - if (m_control == CONTROL_DATA || m_control == CONTROL_VOICE) - writeSyncSamples(); -#endif #if defined(DUMP_SAMPLES) if (m_control == CONTROL_DATA || m_control == CONTROL_VOICE) writeSamples(ptr); @@ -414,22 +409,6 @@ void CDMRSlotRX::writeRSSIData(uint8_t* frame) #endif } -#if defined(DUMP_SYNC_SAMPLES) -void CDMRSlotRX::writeSyncSamples() -{ - uint16_t ptr = m_syncPtr - DMR_SYNC_LENGTH_SAMPLES + DMR_RADIO_SYMBOL_LENGTH; - - q15_t sync[DMR_SYNC_LENGTH_SYMBOLS]; - - for (uint16_t i = 0U; i < DMR_SYNC_LENGTH_SYMBOLS; i++) { - sync[i] = m_buffer[ptr]; - ptr += DMR_RADIO_SYMBOL_LENGTH; - } - - serial.writeSyncSamples(STATE_DMR, sync, DMR_SYNC_LENGTH_SYMBOLS); -} -#endif - #if defined(DUMP_SAMPLES) void CDMRSlotRX::writeSamples(uint16_t start) { diff --git a/DMRSlotRX.h b/DMRSlotRX.h index df4c0cd..037557d 100644 --- a/DMRSlotRX.h +++ b/DMRSlotRX.h @@ -67,7 +67,6 @@ private: void correlateSync(bool first); void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); void writeRSSIData(uint8_t* frame); - void writeSyncSamples(); void writeSamples(uint16_t start); }; diff --git a/P25RX.cpp b/P25RX.cpp index 3f384fa..7faaec2 100644 --- a/P25RX.cpp +++ b/P25RX.cpp @@ -18,8 +18,7 @@ #define WANT_DEBUG -// #define DUMP_SYNC_SAMPLES -#define DUMP_SAMPLES +// #define DUMP_SAMPLES #include "Config.h" #include "Globals.h" @@ -181,9 +180,6 @@ void CP25RX::processHdr(q15_t sample) uint8_t frame[P25_HDR_FRAME_LENGTH_BYTES + 1U]; samplesToBits(m_hdrStartPtr, P25_HDR_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal); -#if defined(DUMP_SYNC_SAMPLES) - writeSyncSamples(m_hdrStartPtr); -#endif frame[0U] = 0x01U; serial.writeP25Hdr(frame, P25_HDR_FRAME_LENGTH_BYTES + 1U); @@ -230,9 +226,6 @@ void CP25RX::processLdu(q15_t sample) uint8_t frame[P25_LDU_FRAME_LENGTH_BYTES + 3U]; samplesToBits(m_lduStartPtr, P25_LDU_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal); -#if defined(DUMP_SYNC_SAMPLES) - writeSyncSamples(m_lduStartPtr); -#endif #if defined(DUMP_SAMPLES) writeSamples(m_lduStartPtr); #endif @@ -481,23 +474,6 @@ void CP25RX::writeRSSILdu(uint8_t* ldu) m_rssiCount = 0U; } -#if defined(DUMP_SYNC_SAMPLES) -void CP25RX::writeSyncSamples(uint16_t start) -{ - q15_t sync[P25_SYNC_LENGTH_SYMBOLS]; - - for (uint16_t i = 0U; i < P25_SYNC_LENGTH_SYMBOLS; i++) { - sync[i] = m_buffer[start]; - - start += P25_RADIO_SYMBOL_LENGTH; - if (start >= P25_LDU_FRAME_LENGTH_SAMPLES) - start -= P25_LDU_FRAME_LENGTH_SAMPLES; - } - - serial.writeSyncSamples(STATE_P25, sync, P25_SYNC_LENGTH_SYMBOLS); -} -#endif - #if defined(DUMP_SAMPLES) void CP25RX::writeSamples(uint16_t start) { diff --git a/P25RX.h b/P25RX.h index 6524e77..71cc5f2 100644 --- a/P25RX.h +++ b/P25RX.h @@ -67,7 +67,6 @@ private: void calculateLevels(uint16_t start, uint16_t count); void samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); void writeRSSILdu(uint8_t* ldu); - void writeSyncSamples(uint16_t start); void writeSamples(uint16_t start); }; diff --git a/SerialPort.cpp b/SerialPort.cpp index f841f03..58db192 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -62,8 +62,7 @@ const uint8_t MMDVM_NAK = 0x7FU; const uint8_t MMDVM_SERIAL = 0x80U; -const uint8_t MMDVM_SAMPLES = 0xEFU; -const uint8_t MMDVM_SYNC_SAMPLES = 0xF0U; +const uint8_t MMDVM_SAMPLES = 0xF0U; const uint8_t MMDVM_DEBUG1 = 0xF1U; const uint8_t MMDVM_DEBUG2 = 0xF2U; @@ -927,29 +926,6 @@ void CSerialPort::writeRSSIData(const uint8_t* data, uint8_t length) writeInt(1U, reply, count); } -void CSerialPort::writeSyncSamples(uint8_t mode, const q15_t* samples, uint8_t nSamples) -{ - uint8_t reply[130U]; - - reply[0U] = MMDVM_FRAME_START; - reply[1U] = 0U; - reply[2U] = MMDVM_SYNC_SAMPLES; - - reply[3U] = mode; - - uint8_t count = 4U; - for (uint8_t i = 0U; i < nSamples; i++) { - uint16_t val = uint16_t(samples[i] + 2048); - - reply[count++] = (val >> 8) & 0xFF; - reply[count++] = (val >> 0) & 0xFF; - } - - reply[1U] = count; - - writeInt(1U, reply, count, true); -} - void CSerialPort::writeSamples(uint8_t mode, const q15_t* samples, uint16_t nSamples) { uint8_t reply[1800U]; diff --git a/SerialPort.h b/SerialPort.h index c99e9ba..f7ceec6 100644 --- a/SerialPort.h +++ b/SerialPort.h @@ -49,7 +49,6 @@ public: void writeCalData(const uint8_t* data, uint8_t length); void writeRSSIData(const uint8_t* data, uint8_t length); - void writeSyncSamples(uint8_t mode, const q15_t* samples, uint8_t nSamples); void writeSamples(uint8_t mode, const q15_t* samples, uint16_t nSamples); void writeDebug(const char* text); diff --git a/YSFRX.cpp b/YSFRX.cpp index d9936b8..4fa7fe1 100644 --- a/YSFRX.cpp +++ b/YSFRX.cpp @@ -18,8 +18,7 @@ #define WANT_DEBUG -// #define DUMP_SYNC_SAMPLES -#define DUMP_SAMPLES +// #define DUMP_SAMPLES #include "Config.h" #include "Globals.h" @@ -183,9 +182,6 @@ void CYSFRX::processData(q15_t sample) uint8_t frame[YSF_FRAME_LENGTH_BYTES + 3U]; samplesToBits(m_startPtr, YSF_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal); -#if defined(DUMP_SYNC_SAMPLES) - writeSyncSamples(m_startPtr); -#endif #if defined(DUMP_SAMPLES) writeSamples(m_startPtr); #endif @@ -416,23 +412,6 @@ void CYSFRX::writeRSSIData(uint8_t* data) m_rssiCount = 0U; } -#if defined(DUMP_SYNC_SAMPLES) -void CYSFRX::writeSyncSamples(uint16_t start) -{ - q15_t sync[YSF_SYNC_LENGTH_SYMBOLS]; - - for (uint16_t i = 0U; i < YSF_SYNC_LENGTH_SYMBOLS; i++) { - sync[i] = m_buffer[start]; - - start += YSF_RADIO_SYMBOL_LENGTH; - if (start >= YSF_FRAME_LENGTH_SAMPLES) - start -= YSF_FRAME_LENGTH_SAMPLES; - } - - serial.writeSyncSamples(STATE_YSF, sync, YSF_SYNC_LENGTH_SYMBOLS); -} -#endif - #if defined(DUMP_SAMPLES) void CYSFRX::writeSamples(uint16_t start) { diff --git a/YSFRX.h b/YSFRX.h index 1b282e5..ebf17af 100644 --- a/YSFRX.h +++ b/YSFRX.h @@ -63,7 +63,6 @@ private: void calculateLevels(uint16_t start, uint16_t count); void samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold); void writeRSSIData(uint8_t* data); - void writeSyncSamples(uint16_t start); void writeSamples(uint16_t start); };