From d1113fa0ab4aff8d3467dff439adc65be0cad459 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 7 Mar 2020 17:38:42 +0100 Subject: [PATCH] ChirpChat mod: calculate m_modSample after m_modPhasor --- .../channeltx/modchirpchat/chirpchatmodsource.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp b/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp index 0a03496a3..4502e5e4a 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodsource.cpp @@ -198,9 +198,8 @@ void ChirpChatModSource::modulateSample() } else if (m_state == ChirpChatStatePreamble) { - // m_modSample = m_upChirps[m_chirp]; - m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_modPhasor += m_phaseIncrements[m_chirp]; + m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_fftCounter++; if (m_fftCounter == m_fftLength*ChirpChatModSettings::oversampling) @@ -230,9 +229,8 @@ void ChirpChatModSource::modulateSample() } else if (m_state == ChirpChatStateSyncWord) { - // m_modSample = m_upChirps[m_chirp]; - m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_modPhasor += m_phaseIncrements[m_chirp]; + m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_fftCounter++; if (m_fftCounter == m_fftLength*ChirpChatModSettings::oversampling) @@ -254,10 +252,9 @@ void ChirpChatModSource::modulateSample() } else if (m_state == ChirpChatStateSFD) { - // m_modSample = m_downChirps[m_chirp]; - m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); int chirpIndex = m_fftLength*ChirpChatModSettings::oversampling - 1 - m_chirp; m_modPhasor += m_phaseIncrements[chirpIndex]; + m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_fftCounter++; m_sampleCounter++; @@ -285,9 +282,8 @@ void ChirpChatModSource::modulateSample() } else if (m_state == ChirpChatStatePayload) { - // m_modSample = m_upChirps[m_chirp]; - m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_modPhasor += m_phaseIncrements[m_chirp]; + m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)); m_fftCounter++; if (m_fftCounter == m_fftLength*ChirpChatModSettings::oversampling)