Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix txbuffer overflows and bring back elegant while loop

This commit is contained in:
Geoffrey Merck 2020-05-13 22:57:42 +02:00
parent c47eacd010
commit b245be464f
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FM.cpp
View File

@ -20,7 +20,7 @@
#include "Globals.h" #include "Globals.h"
#include "FM.h" #include "FM.h"
const uint16_t FM_TX_BLOCK_SIZE = 400U; const uint16_t FM_TX_BLOCK_SIZE = 100U;
const uint16_t FM_SERIAL_BLOCK_SIZE = 42U;//this is actually the number of sample pairs to send over serial. One sample pair is 3bytes. const uint16_t FM_SERIAL_BLOCK_SIZE = 42U;//this is actually the number of sample pairs to send over serial. One sample pair is 3bytes.
//three times this value shall never exceed 126 ! //three times this value shall never exceed 126 !
@ -152,30 +152,13 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
void CFM::process() void CFM::process()
{ {
uint16_t space = io.getSpace() - 2U; q15_t sample;
uint16_t length = m_outputRFRB.getData(); while (io.getSpace() >= 3U && m_outputRFRB.get(sample)) {
if (space > 2 && length >= FM_TX_BLOCK_SIZE ) { io.write(STATE_FM, &sample, 1);
if(length > FM_TX_BLOCK_SIZE)
length = FM_TX_BLOCK_SIZE;
if(space > FM_TX_BLOCK_SIZE)
space = FM_TX_BLOCK_SIZE;
if(length > space)
length = space;
q15_t samples[FM_TX_BLOCK_SIZE];
for (uint16_t i = 0U; i < length; i++) {
q15_t sample = 0;
m_outputRFRB.get(sample);
samples[i] = sample;
}
io.write(STATE_FM, samples, length);
} }
if(m_extEnabled) { if(m_extEnabled) {
length = m_downsampler.getData(); uint16_t length = m_downsampler.getData();
if(length >= FM_SERIAL_BLOCK_SIZE) { if(length >= FM_SERIAL_BLOCK_SIZE) {
if(length > FM_SERIAL_BLOCK_SIZE) if(length > FM_SERIAL_BLOCK_SIZE)