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
2 changed files with 8 additions and 5 deletions
+6 -4
View File
@@ -20,9 +20,11 @@
#include "Globals.h"
#include "FM.h"
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.
//three times this value shall never exceed 126 !
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 252
const uint16_t FM_SERIAL_BLOCK_SIZE_BYTES = FM_SERIAL_BLOCK_SIZE * 3U;
CFM::CFM() :
m_callsign(),
@@ -721,8 +723,8 @@ void CFM::beginRelaying()
uint8_t CFM::getSpace() const
{
// The amount of free space for receiving external audio, in bytes.
return m_inputExtRB.getSpace();
// The amount of free space for receiving external audio, in frames.
return m_inputExtRB.getSpace() / FM_SERIAL_BLOCK_SIZE_BYTES;
}
uint8_t CFM::writeData(const uint8_t* data, uint8_t length)
+2 -1
View File
@@ -92,5 +92,6 @@ bool CFMUpSampler::getSample(q15_t& sample)
uint16_t CFMUpSampler::getSpace() const
{
return m_samples.getSpace();
//return available space in bytes
return m_samples.getSpace() * sizeof(TSamplePairPack);
}