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

Merge pull request #272 from F4FXL/FM_Ext 

Fix compiler warnings
This commit is contained in:
Jonathan Naylor 2020-05-13 11:10:04 +01:00 committed by GitHub
parent 51e5e7b851 9023b6ae13
commit fa9f89700f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FM.cpp
View File

@ -695,6 +695,7 @@ uint8_t CFM::getSpace() const
uint8_t CFM::writeData(const uint8_t* data, uint8_t length) uint8_t CFM::writeData(const uint8_t* data, uint8_t length)
{ {
m_inputExtRB.addData(data, length); m_inputExtRB.addData(data, length);
return 0U;//maybe return an error if overflowing ?
} }
void CFM::insertDelay(uint16_t ms) void CFM::insertDelay(uint16_t ms)

12
FMDownsampler.cpp
View File

@ -28,7 +28,7 @@ m_samplePackPointer(NULL),
m_packIndex(0U), m_packIndex(0U),
m_downSampleIndex(0U) m_downSampleIndex(0U)
{ {
m_samplePackPointer = &m_samplePack; m_samplePackPointer = (uint8_t*)&m_samplePack;
} }
void CFMDownsampler::addSample(q15_t sample) void CFMDownsampler::addSample(q15_t sample)
@ -40,14 +40,14 @@ void CFMDownsampler::addSample(q15_t sample)
m_samplePack = uint32_t(sample) << 12; m_samplePack = uint32_t(sample) << 12;
break; break;
case 1:{ case 1:{
m_samplePack |= uint32_t(sample); m_samplePack |= uint32_t(sample);
//we did not use MSB; skip it //we did not use MSB; skip it
TSamplePairPack pair{m_samplePackPointer[1U], m_samplePackPointer[2U], m_samplePackPointer[3U]}; TSamplePairPack pair{m_samplePackPointer[1U], m_samplePackPointer[2U], m_samplePackPointer[3U]};
m_ringBuffer.put(pair); m_ringBuffer.put(pair);
m_samplePack = 0;//reset the sample pack m_samplePack = 0;//reset the sample pack
} }
break; break;
default: default:

2
FMDownsampler.h
View File

@ -36,7 +36,7 @@ private:
CRingBuffer<TSamplePairPack> m_ringBuffer; CRingBuffer<TSamplePairPack> m_ringBuffer;
uint32_t m_samplePack; uint32_t m_samplePack;
uint32_t *m_samplePackPointer; uint8_t *m_samplePackPointer;
uint8_t m_packIndex; uint8_t m_packIndex;
uint8_t m_downSampleIndex; uint8_t m_downSampleIndex;