Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove the sync sample dumping.

c4fmdemod
Jonathan Naylor 2017-02-21 17:51:09 +00:00
parent 2f9eb3523d
commit a6affb765e
10 changed files with 5 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DMRDMORX.cpp
View File

@ -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)
{

1
DMRDMORX.h
View File

@ -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);
};

23
DMRSlotRX.cpp
View File

@ -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)
{

1
DMRSlotRX.h
View File

@ -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);
};

26
P25RX.cpp
View File

@ -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)
{

1
P25RX.h
View File

@ -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);
};

26
SerialPort.cpp
View File

@ -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];

1
SerialPort.h
View File

@ -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);

23
YSFRX.cpp
View File

@ -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)
{

1
YSFRX.h
View File

@ -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);
};