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

Merge pull request #285 from F4FXL/FM_Ext 

Habdle full frame length
This commit is contained in:
Jonathan Naylor 2020-05-31 21:14:35 +01:00 committed by GitHub
parent 1ed3a4c9d5 2a4b28c35e
commit ec9428d63e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FM.cpp
View File

@ -20,9 +20,11 @@
#include "Globals.h" #include "Globals.h"
#include "FM.h" #include "FM.h"
const uint16_t FM_TX_BLOCK_SIZE = 100U; 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 = 84U;//this is 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 252
const uint16_t FM_SERIAL_BLOCK_SIZE_BYTES = FM_SERIAL_BLOCK_SIZE * 3U;
CFM::CFM() : CFM::CFM() :
m_callsign(), m_callsign(),
@ -721,8 +723,8 @@ void CFM::beginRelaying()
uint8_t CFM::getSpace() const uint8_t CFM::getSpace() const
{ {
// The amount of free space for receiving external audio, in bytes. // The amount of free space for receiving external audio, in frames.
return m_inputExtRB.getSpace(); return m_inputExtRB.getSpace() / FM_SERIAL_BLOCK_SIZE_BYTES;
} }
uint8_t CFM::writeData(const uint8_t* data, uint8_t length) uint8_t CFM::writeData(const uint8_t* data, uint8_t length)

3
FMUpSampler.cpp
View File

@ -92,5 +92,6 @@ bool CFMUpSampler::getSample(q15_t& sample)
uint16_t CFMUpSampler::getSpace() const uint16_t CFMUpSampler::getSpace() const
{ {
return m_samples.getSpace(); //return available space in bytes
return m_samples.getSpace() * sizeof(TSamplePairPack);
} }