ngscopeclient · May 23, 2020
diff --git a/scopemeasurements/CMakeLists.txt b/scopemeasurements/CMakeLists.txt
@@ -3,7 +3,6 @@ link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 set(SCOPEMEASUREMENTS_SOURCES
 	#EyeHeightMeasurement.cpp
-	#EyePeriodMeasurement.cpp
 	#OvershootMeasurement.cpp
 	#PkPkVoltageMeasurement.cpp
 	#UndershootMeasurement.cpp

diff --git a/scopemeasurements/scopemeasurements.cpp b/scopemeasurements/scopemeasurements.cpp
@@ -44,7 +44,6 @@ void ScopeMeasurementStaticInit()
 {
 	/*
 	AddMeasurementClass(EyeHeightMeasurement);
-	AddMeasurementClass(EyePeriodMeasurement);
 	AddMeasurementClass(OvershootMeasurement);
 	AddMeasurementClass(PkPkVoltageMeasurement);
 	AddMeasurementClass(UndershootMeasurement);

diff --git a/scopemeasurements/scopemeasurements.h b/scopemeasurements/scopemeasurements.h
@@ -41,7 +41,6 @@
 #include "../scopehal/Measurement.h"
 
 #include "EyeHeightMeasurement.h"
-#include "EyePeriodMeasurement.h"
 #include "OvershootMeasurement.h"
 #include "PkPkVoltageMeasurement.h"
 #include "UndershootMeasurement.h"

diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SCOPEPROTOCOLS_SOURCES
 	EyeBitRateMeasurementDecoder.cpp
 	EyeDecoder2.cpp
 	EyeJitterMeasurementDecoder.cpp
+	EyePeriodMeasurementDecoder.cpp
 	EyeWidthMeasurementDecoder.cpp
 	FallMeasurementDecoder.cpp
 	FFTDecoder.cpp

diff --git a/scopemeasurements/EyePeriodMeasurement.cpp → ...protocols/EyePeriodMeasurementDecoder.cpp b/scopemeasurements/EyePeriodMeasurement.cpp → ...protocols/EyePeriodMeasurementDecoder.cpp
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -27,66 +27,98 @@
 *                                                                                                                      *
 ***********************************************************************************************************************/
 
-/**
-	@file
-	@author Andrew D. Zonenberg
-	@brief Declaration of EyePeriodMeasurement
- */
-
-#include "scopemeasurements.h"
-#include "EyePeriodMeasurement.h"
-#include "../scopeprotocols/EyeDecoder2.h"
+#include "scopeprotocols.h"
+#include "EyePeriodMeasurementDecoder.h"
+#include "EyeDecoder2.h"
 
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Construction/destruction
+// Construction / destruction
 
-EyePeriodMeasurement::EyePeriodMeasurement()
-	: FloatMeasurement(TYPE_TIME)
+EyePeriodMeasurementDecoder::EyePeriodMeasurementDecoder(string color)
+	: ProtocolDecoder(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_MEASUREMENT)
 {
-	//Configure for a single input
-	m_signalNames.push_back("Vin");
+	m_yAxisUnit = Unit(Unit::UNIT_PS);
+
+	//Set up channels
+	m_signalNames.push_back("Eye");
 	m_channels.push_back(NULL);
+
+	m_value = 0;
 }
 
-EyePeriodMeasurement::~EyePeriodMeasurement()
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Factory methods
+
+bool EyePeriodMeasurementDecoder::ValidateChannel(size_t i, OscilloscopeChannel* channel)
 {
+	if( (i == 0) && (channel->GetType() == OscilloscopeChannel::CHANNEL_TYPE_EYE) )
+		return true;
+	return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Accessors
 
-Measurement::MeasurementType EyePeriodMeasurement::GetMeasurementType()
+void EyePeriodMeasurementDecoder::SetDefaultName()
 {
-	return Measurement::MEAS_HORZ;
+	char hwname[256];
+	snprintf(hwname, sizeof(hwname), "EyePeriod(%s)", m_channels[0]->m_displayname.c_str());
+	m_hwname = hwname;
+	m_displayname = m_hwname;
 }
 
-string EyePeriodMeasurement::GetMeasurementName()
+string EyePeriodMeasurementDecoder::GetProtocolName()
 {
 	return "Eye Period";
 }
 
-bool EyePeriodMeasurement::ValidateChannel(size_t i, OscilloscopeChannel* channel)
+bool EyePeriodMeasurementDecoder::IsOverlay()
 {
-	if( (i == 0) && dynamic_cast<EyeDecoder2*>(channel) != NULL )
-		return true;
+	//we create a new analog channel
+	return false;
+}
+
+bool EyePeriodMeasurementDecoder::NeedsConfig()
+{
+	//automatic configuration
 	return false;
 }
 
+double EyePeriodMeasurementDecoder::GetVoltageRange()
+{
+	return 10;
+}
+
+double EyePeriodMeasurementDecoder::GetOffset()
+{
+	return -m_value;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Measurement processing
+// Actual decoder logic
 
-bool EyePeriodMeasurement::Refresh()
+void EyePeriodMeasurementDecoder::Refresh()
 {
 	//Get the input data
 	if(m_channels[0] == NULL)
-		return false;
-	auto chan = dynamic_cast<EyeDecoder2*>(m_channels[0]);
-	auto din = dynamic_cast<EyeCapture2*>(chan->GetData());
+		return;
+	auto din = dynamic_cast<EyeWaveform*>(m_channels[0]->GetData());
 	if(din == NULL)
-		return false;
+		return;
+
+	//Create the output
+	auto cap = new AnalogWaveform;
+	cap->m_offsets.push_back(0);
+	cap->m_durations.push_back(2 * din->m_uiWidth);
+	m_value = din->m_uiWidth;
+	cap->m_samples.push_back(m_value);
+
+	SetData(cap);
 
-	m_value = chan->GetUIWidth() * 1e-12f;
-	return true;
+	//Copy start time etc from the input. Timestamps are in picoseconds.
+	cap->m_timescale = 1;
+	cap->m_startTimestamp = din->m_startTimestamp;
+	cap->m_startPicoseconds = din->m_startPicoseconds;
 }
diff --git a/scopemeasurements/EyePeriodMeasurement.h → scopeprotocols/EyePeriodMeasurementDecoder.h b/scopemeasurements/EyePeriodMeasurement.h → scopeprotocols/EyePeriodMeasurementDecoder.h
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ANTIKERNEL v0.1                                                                                                      *
 *                                                                                                                      *
-* Copyright (c) 2012-2019 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2020 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -30,27 +30,35 @@
 /**
 	@file
 	@author Andrew D. Zonenberg
-	@brief Declaration of EyePeriodMeasurement
+	@brief Declaration of EyePeriodMeasurementDecoder
  */
-#ifndef EyePeriodMeasurement_h
-#define EyePeriodMeasurement_h
+#ifndef EyePeriodMeasurementDecoder_h
+#define EyePeriodMeasurementDecoder_h
 
-#include "../scopehal/Measurement.h"
+#include "../scopehal/ProtocolDecoder.h"
 
-class EyePeriodMeasurement : public FloatMeasurement
+class EyePeriodMeasurementDecoder : public ProtocolDecoder
 {
 public:
-	EyePeriodMeasurement();
-	virtual ~EyePeriodMeasurement();
+	EyePeriodMeasurementDecoder(std::string color);
 
-	virtual bool Refresh();
+	virtual void Refresh();
+
+	virtual bool NeedsConfig();
+	virtual bool IsOverlay();
+
+	static std::string GetProtocolName();
+	virtual void SetDefaultName();
+
+	virtual double GetVoltageRange();
+	virtual double GetOffset();
 
-	static std::string GetMeasurementName();
 	virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);
 
-	virtual MeasurementType GetMeasurementType();
+	PROTOCOL_DECODER_INITPROC(EyePeriodMeasurementDecoder)
 
-	MEASUREMENT_INITPROC(EyePeriodMeasurement)
+protected:
+	float m_value;
 };
 
 #endif
diff --git a/scopeprotocols/scopeprotocols.cpp b/scopeprotocols/scopeprotocols.cpp
@@ -59,6 +59,7 @@ void ScopeProtocolStaticInit()
 	AddDecoderClass(EyeBitRateMeasurementDecoder);
 	AddDecoderClass(EyeDecoder2);
 	AddDecoderClass(EyeJitterMeasurementDecoder);
+	AddDecoderClass(EyePeriodMeasurementDecoder);
 	AddDecoderClass(EyeWidthMeasurementDecoder);
 	AddDecoderClass(FallMeasurementDecoder);
 	AddDecoderClass(FFTDecoder);

diff --git a/scopeprotocols/scopeprotocols.h b/scopeprotocols/scopeprotocols.h
@@ -60,6 +60,7 @@
 #include "EyeBitRateMeasurementDecoder.h"
 #include "EyeDecoder2.h"
 #include "EyeJitterMeasurementDecoder.h"
+#include "EyePeriodMeasurementDecoder.h"
 #include "EyeWidthMeasurementDecoder.h"
 #include "FallMeasurementDecoder.h"
 #include "FFTDecoder.h"