Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update FMControl.cpp

Browse source 
Changes to FMControl.cpp to change Chunks from  168 to 160 . Needed to be compatible with USRP Asterisk Protocol
Further development needed would  be to  add the PREEMPHASIS_GAIN_DB and DEEMPHASIS_GAIN_DB as variables in MMDVM.ini
to adjust  FM gateway  audio gain  without recompiling
This commit is contained in:
ve2dje 2021-03-04 23:38:52 -05:00 committed by GitHub
parent c5e9a68d28
commit 1397a6d782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
FMControl.cpp
View file

@ -26,9 +26,9 @@
#define SWAP_BYTES_16(a) (((a >> 8) & 0x00FFU) | ((a << 8) & 0xFF00U))
const float DEEMPHASIS_GAIN_DB = 0.0F;
const float PREEMPHASIS_GAIN_DB = 13.0F;
const float FILTER_GAIN_DB = 0.0F;
const float DEEMPHASIS_GAIN_DB = 8.0F; // Audio gain adjustment
const float PREEMPHASIS_GAIN_DB = 0.0F; // Audio gain adjustment
const float FILTER_GAIN_DB = 2.0F; // Audio gain adjustment
const unsigned int FM_MASK = 0x00000FFFU;
CFMControl::CFMControl(CFMNetwork* network) :
@ -79,17 +79,17 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
m_incomingRFAudio.addData(data + 1U, length - 1U);
unsigned int bufferLength = m_incomingRFAudio.dataSize();
if (bufferLength > 252U)//168 samples 12-bit
bufferLength = 252U;
if (bufferLength > 240U) //160 samples 12-bit
bufferLength = 240U; //160 samples 12-bit
if (bufferLength >= 3U) {
bufferLength = bufferLength - bufferLength % 3U; //round down to nearest multiple of 3
unsigned char bufferData[252U];
unsigned char bufferData[240U]; //160 samples 12-bit
m_incomingRFAudio.getData(bufferData, bufferLength);
unsigned int pack = 0U;
unsigned char* packPointer = (unsigned char*)&pack;
float out[168U];
float out[160U]; //160 samples 12-bit
unsigned int nOut = 0U;
short unpackedSamples[2U];
@ -99,7 +99,7 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
packPointer[1U] = bufferData[i + 1U];
packPointer[2U] = bufferData[i + 2U];
unpackedSamples[1U] = short(int(pack & FM_MASK) - 2048);
unpackedSamples[0U] = short(int(pack >> 12) - 2048);
unpackedSamples[0U] = short(int(pack >> 12 & FM_MASK) - 2048); //
//process unpacked sample pair
for (unsigned char j = 0U; j < 2U; j++) {
@ -133,11 +133,11 @@ unsigned int CFMControl::readModem(unsigned char* data, unsigned int space)
if (m_network == NULL)
return 0U;
if (space > 252U)
space = 252U;
if (space > 240U) //160 samples 12-bit
space = 240U; //160 samples 12-bit
float netData[168U]; // Modem can handle up to 168 samples at a time
unsigned int length = m_network->read(netData, 168U);
float netData[160U]; // Modem can handle up to 160 samples at a time
unsigned int length = m_network->read(netData, 160U); //160 samples 12-bit
if (length == 0U)
return 0U;