ngscopeclient · May 10, 2020
diff --git a/scopemeasurements/CMakeLists.txt b/scopemeasurements/CMakeLists.txt
@@ -14,8 +14,6 @@ set(SCOPEMEASUREMENTS_SOURCES
 	FrequencyMeasurement.cpp
 	OvershootMeasurement.cpp
 	PkPkVoltageMeasurement.cpp
-	Rise1090Measurement.cpp
-	Rise2080Measurement.cpp
 	UndershootMeasurement.cpp
 
 	scopemeasurements.cpp

diff --git a/scopemeasurements/Rise2080Measurement.cpp b/scopemeasurements/Rise2080Measurement.cpp
diff --git a/scopemeasurements/Rise2080Measurement.h b/scopemeasurements/Rise2080Measurement.h
diff --git a/scopemeasurements/scopemeasurements.cpp b/scopemeasurements/scopemeasurements.cpp
@@ -54,7 +54,5 @@ void ScopeMeasurementStaticInit()
 	AddMeasurementClass(FrequencyMeasurement);
 	AddMeasurementClass(OvershootMeasurement);
 	AddMeasurementClass(PkPkVoltageMeasurement);
-	AddMeasurementClass(Rise1090Measurement);
-	AddMeasurementClass(Rise2080Measurement);
 	AddMeasurementClass(UndershootMeasurement);
 }
diff --git a/scopemeasurements/scopemeasurements.h b/scopemeasurements/scopemeasurements.h
@@ -51,8 +51,6 @@
 #include "FrequencyMeasurement.h"
 #include "OvershootMeasurement.h"
 #include "PkPkVoltageMeasurement.h"
-#include "Rise1090Measurement.h"
-#include "Rise2080Measurement.h"
 #include "UndershootMeasurement.h"
 
 void ScopeMeasurementStaticInit();

diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
@@ -26,6 +26,7 @@ set(SCOPEPROTOCOLS_SOURCES
 	MovingAverageDecoder.cpp
 	ParallelBusDecoder.cpp
 	PeriodMeasurementDecoder.cpp
+	RiseMeasurementDecoder.cpp
 	SincInterpolationDecoder.cpp
 	ThresholdDecoder.cpp
 	TMDSDecoder.cpp