From df23e15c918b44ba463fc5c1ee76f5bf6ffe28a0 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 13 May 2020 11:52:59 +0200 Subject: [PATCH 1/2] Fix compilation warnings --- FM.cpp | 1 + FMDownsampler.cpp | 2 +- FMDownsampler.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FM.cpp b/FM.cpp index 82fdac1..6315f36 100644 --- a/FM.cpp +++ b/FM.cpp @@ -695,6 +695,7 @@ uint8_t CFM::getSpace() const uint8_t CFM::writeData(const uint8_t* data, uint8_t length) { m_inputExtRB.addData(data, length); + return 0U;//maybe return an error if overflowing ? } void CFM::insertDelay(uint16_t ms) diff --git a/FMDownsampler.cpp b/FMDownsampler.cpp index 4c6b733..922657c 100644 --- a/FMDownsampler.cpp +++ b/FMDownsampler.cpp @@ -28,7 +28,7 @@ m_samplePackPointer(NULL), m_packIndex(0U), m_downSampleIndex(0U) { - m_samplePackPointer = &m_samplePack; + m_samplePackPointer = (uint8_t*)&m_samplePack; } void CFMDownsampler::addSample(q15_t sample) diff --git a/FMDownsampler.h b/FMDownsampler.h index 6ec7201..0254aab 100644 --- a/FMDownsampler.h +++ b/FMDownsampler.h @@ -36,7 +36,7 @@ private: CRingBuffer m_ringBuffer; uint32_t m_samplePack; - uint32_t *m_samplePackPointer; + uint8_t *m_samplePackPointer; uint8_t m_packIndex; uint8_t m_downSampleIndex; From 9023b6ae13e13763a23d0c4b15fa21a31d5661bf Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 13 May 2020 12:03:52 +0200 Subject: [PATCH 2/2] Correct indentation --- FMDownsampler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/FMDownsampler.cpp b/FMDownsampler.cpp index 922657c..a5a127f 100644 --- a/FMDownsampler.cpp +++ b/FMDownsampler.cpp @@ -40,14 +40,14 @@ void CFMDownsampler::addSample(q15_t sample) m_samplePack = uint32_t(sample) << 12; break; case 1:{ - m_samplePack |= uint32_t(sample); - - //we did not use MSB; skip it - TSamplePairPack pair{m_samplePackPointer[1U], m_samplePackPointer[2U], m_samplePackPointer[3U]}; + m_samplePack |= uint32_t(sample); + + //we did not use MSB; skip it + 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; default: