ngscopeclient · May 7, 2019
Showing with 202 additions and 0 deletions.

+1 −0 scopeprotocols/CMakeLists.txt

+136 −0 scopeprotocols/DCOffsetDecoder.cpp

+63 −0 scopeprotocols/DCOffsetDecoder.h

+1 −0 scopeprotocols/scopeprotocols.cpp

+1 −0 scopeprotocols/scopeprotocols.h
diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
@@ -4,6 +4,7 @@ link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 set(SCOPEPROTOCOLS_SOURCES
 	ACCoupleDecoder.cpp
 	ClockRecoveryDecoder.cpp
+	DCOffsetDecoder.cpp
 	DifferenceDecoder.cpp
 	Ethernet10BaseTDecoder.cpp
 	Ethernet100BaseTDecoder.cpp

diff --git a/scopeprotocols/DCOffsetDecoder.cpp b/scopeprotocols/DCOffsetDecoder.cpp
@@ -0,0 +1,136 @@
+/***********************************************************************************************************************
+*                                                                                                                      *
+* ANTIKERNEL v0.1                                                                                                      *
+*                                                                                                                      *
+* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* All rights reserved.                                                                                                 *
+*                                                                                                                      *
+* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
+* following conditions are met:                                                                                        *
+*                                                                                                                      *
+*    * Redistributions of source code must retain the above copyright notice, this list of conditions, and the         *
+*      following disclaimer.                                                                                           *
+*                                                                                                                      *
+*    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the       *
+*      following disclaimer in the documentation and/or other materials provided with the distribution.                *
+*                                                                                                                      *
+*    * Neither the name of the author nor the names of any contributors may be used to endorse or promote products     *
+*      derived from this software without specific prior written permission.                                           *
+*                                                                                                                      *
+* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   *
+* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
+* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES        *
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR       *
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE       *
+* POSSIBILITY OF SUCH DAMAGE.                                                                                          *
+*                                                                                                                      *
+***********************************************************************************************************************/
+
+#include "../scopehal/scopehal.h"
+#include "DCOffsetDecoder.h"
+#include "../scopehal/AnalogRenderer.h"
+
+using namespace std;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Construction / destruction
+
+DCOffsetDecoder::DCOffsetDecoder(string color)
+	: ProtocolDecoder(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_MATH)
+{
+	//Set up channels
+	m_signalNames.push_back("din");
+	m_channels.push_back(NULL);
+
+	m_offsetname = "Offset";
+	m_parameters[m_offsetname] = ProtocolDecoderParameter(ProtocolDecoderParameter::TYPE_FLOAT);
+	m_parameters[m_offsetname].SetFloatVal(0);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Factory methods
+
+ChannelRenderer* DCOffsetDecoder::CreateRenderer()
+{
+	return new AnalogRenderer(this);
+}
+
+bool DCOffsetDecoder::ValidateChannel(size_t i, OscilloscopeChannel* channel)
+{
+	if( (i == 0) && (channel->GetType() == OscilloscopeChannel::CHANNEL_TYPE_ANALOG) )
+		return true;
+	return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Accessors
+
+double DCOffsetDecoder::GetVoltageRange()
+{
+	return m_channels[0]->GetVoltageRange();
+}
+
+string DCOffsetDecoder::GetProtocolName()
+{
+	return "DC offset";
+}
+
+bool DCOffsetDecoder::IsOverlay()
+{
+	//we create a new analog channel
+	return false;
+}
+
+bool DCOffsetDecoder::NeedsConfig()
+{
+	//we need the offset to be specified, duh
+	return true;
+}
+
+void DCOffsetDecoder::SetDefaultName()
+{
+	char hwname[256];
+	float offset = m_parameters[m_offsetname].GetFloatVal();
+	if(offset >= 0)
+		snprintf(hwname, sizeof(hwname), "%s + %.3f", m_channels[0]->m_displayname.c_str(), offset);
+	else
+		snprintf(hwname, sizeof(hwname), "%s %.3f", m_channels[0]->m_displayname.c_str(), offset);
+	m_hwname = hwname;
+	m_displayname = m_hwname;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Actual decoder logic
+
+void DCOffsetDecoder::Refresh()
+{
+	//Get the input data
+	if(m_channels[0] == NULL)
+	{
+		SetData(NULL);
+		return;
+	}
+	AnalogCapture* din = dynamic_cast<AnalogCapture*>(m_channels[0]->GetData());
+
+	//We need meaningful data
+	if(din->GetDepth() == 0)
+	{
+		SetData(NULL);
+		return;
+	}
+
+	float offset = m_parameters[m_offsetname].GetFloatVal();
+
+	//Subtract all of our samples
+	AnalogCapture* cap = new AnalogCapture;
+	for(size_t i=0; i<din->m_samples.size(); i++)
+	{
+		AnalogSample sin = din->m_samples[i];
+		cap->m_samples.push_back(AnalogSample(sin.m_offset, sin.m_duration, sin.m_sample + offset));
+	}
+	SetData(cap);
+
+	//Copy our time scales from the input
+	cap->m_timescale = din->m_timescale;
+}
diff --git a/scopeprotocols/DCOffsetDecoder.h b/scopeprotocols/DCOffsetDecoder.h
@@ -0,0 +1,63 @@
+/***********************************************************************************************************************
+*                                                                                                                      *
+* ANTIKERNEL v0.1                                                                                                      *
+*                                                                                                                      *
+* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* All rights reserved.                                                                                                 *
+*                                                                                                                      *
+* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
+* following conditions are met:                                                                                        *
+*                                                                                                                      *
+*    * Redistributions of source code must retain the above copyright notice, this list of conditions, and the         *
+*      following disclaimer.                                                                                           *
+*                                                                                                                      *
+*    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the       *
+*      following disclaimer in the documentation and/or other materials provided with the distribution.                *
+*                                                                                                                      *
+*    * Neither the name of the author nor the names of any contributors may be used to endorse or promote products     *
+*      derived from this software without specific prior written permission.                                           *
+*                                                                                                                      *
+* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   *
+* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
+* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES        *
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR       *
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE       *
+* POSSIBILITY OF SUCH DAMAGE.                                                                                          *
+*                                                                                                                      *
+***********************************************************************************************************************/
+
+/**
+	@file
+	@author Andrew D. Zonenberg
+	@brief Declaration of DCOffsetDecoder
+ */
+#ifndef DCOffsetDecoder_h
+#define DCOffsetDecoder_h
+
+#include "../scopehal/ProtocolDecoder.h"
+
+class DCOffsetDecoder : public ProtocolDecoder
+{
+public:
+	DCOffsetDecoder(std::string color);
+
+	virtual void Refresh();
+	virtual ChannelRenderer* CreateRenderer();
+
+	virtual bool NeedsConfig();
+	virtual bool IsOverlay();
+
+	static std::string GetProtocolName();
+	virtual void SetDefaultName();
+
+	virtual double GetVoltageRange();
+	virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);
+
+	PROTOCOL_DECODER_INITPROC(DCOffsetDecoder)
+
+protected:
+	std::string m_offsetname;
+};
+
+#endif
diff --git a/scopeprotocols/scopeprotocols.cpp b/scopeprotocols/scopeprotocols.cpp
@@ -44,6 +44,7 @@ void ScopeProtocolStaticInit()
 {
 	AddDecoderClass(ACCoupleDecoder);
 	AddDecoderClass(ClockRecoveryDecoder);
+	AddDecoderClass(DCOffsetDecoder);
 	AddDecoderClass(DifferenceDecoder);
 	AddDecoderClass(Ethernet10BaseTDecoder);
 	AddDecoderClass(Ethernet100BaseTDecoder);

diff --git a/scopeprotocols/scopeprotocols.h b/scopeprotocols/scopeprotocols.h
@@ -42,6 +42,7 @@
 
 #include "ACCoupleDecoder.h"
 #include "ClockRecoveryDecoder.h"
+#include "DCOffsetDecoder.h"
 #include "DifferenceDecoder.h"
 #include "EthernetAutonegotiationDecoder.h"
 #include "EthernetProtocolDecoder.h"