From e061b5eb2c51a18b6ec8ddfa259f9b541a35c2f5 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 17 Mar 2017 09:29:09 +0100 Subject: [PATCH] ATV Demod: added vestigial modes (VAMU, VAML) just switching to notmal AM for now --- plugins/channelrx/demodatv/atvdemod.cpp | 2 +- plugins/channelrx/demodatv/atvdemod.h | 4 +++- plugins/channelrx/demodatv/atvdemodgui.ui | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index 630e148ff..be2c39ecd 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -223,7 +223,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto m_fltBufferQ[0]=fltNormQ; } - else if (m_objRunning.m_enmModulation == ATV_AM) + else if ((m_objRunning.m_enmModulation == ATV_AM) || (m_objRunning.m_enmModulation == ATV_VAMU) || (m_objRunning.m_enmModulation == ATV_VAML)) { //Amplitude AM fltVal = fltNorm; diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 921f2dc6f..a9ef1b409 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -43,7 +43,9 @@ public: enum ATVModulation { ATV_FM1, ATV_FM2, - ATV_AM + ATV_AM, + ATV_VAMU, + ATV_VAML }; struct ATVConfig diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui index 38b9afcba..9ee89e33b 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.ui +++ b/plugins/channelrx/demodatv/atvdemodgui.ui @@ -141,6 +141,16 @@ AM + + + VAMU + + + + + VAML + +