Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0ef1dd00207
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a03d5832d0e5
Choose a head ref
  • 2 commits
  • 22 files changed
  • 1 contributor

Commits on May 9, 2020

  1. Copy the full SHA
    4e3a3d6 View commit details

Commits on May 10, 2020

  1. Copy the full SHA
    a03d583 View commit details
20 changes: 10 additions & 10 deletions scopehal/Measurement.h
Original file line number Diff line number Diff line change
@@ -96,18 +96,18 @@ class Measurement
static void EnumMeasurements(std::vector<std::string>& names);
static Measurement* CreateMeasurement(std::string measurement);

protected:
public:
//Helpers for more complex measurements
//TODO: create some process for caching this so we don't waste CPU time
float GetMinVoltage(AnalogCapture* cap);
float GetMaxVoltage(AnalogCapture* cap);
float GetBaseVoltage(AnalogCapture* cap);
float GetTopVoltage(AnalogCapture* cap);
float GetAvgVoltage(AnalogCapture* cap);
float GetPeriod(AnalogCapture* cap);
float GetRiseTime(AnalogCapture* cap, float low, float high);
float GetFallTime(AnalogCapture* cap, float low, float high);
std::vector<size_t> MakeHistogram(AnalogCapture* cap, float low, float high, size_t bins);
static float GetMinVoltage(AnalogCapture* cap);
static float GetMaxVoltage(AnalogCapture* cap);
static float GetBaseVoltage(AnalogCapture* cap);
static float GetTopVoltage(AnalogCapture* cap);
static float GetAvgVoltage(AnalogCapture* cap);
static float GetPeriod(AnalogCapture* cap);
static float GetRiseTime(AnalogCapture* cap, float low, float high);
static float GetFallTime(AnalogCapture* cap, float low, float high);
static std::vector<size_t> MakeHistogram(AnalogCapture* cap, float low, float high, size_t bins);

protected:
//Class enumeration
56 changes: 0 additions & 56 deletions scopemeasurements/BaseMeasurement.h

This file was deleted.

6 changes: 0 additions & 6 deletions scopemeasurements/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@ include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})

set(SCOPEMEASUREMENTS_SOURCES
AvgVoltageMeasurement.cpp
BaseMeasurement.cpp
DramRefreshActivateLatencyMeasurement.cpp
DramRowColumnLatencyMeasurement.cpp
EyeBitRateMeasurement.cpp
@@ -14,14 +12,10 @@ set(SCOPEMEASUREMENTS_SOURCES
Fall1090Measurement.cpp
Fall2080Measurement.cpp
FrequencyMeasurement.cpp
MaxVoltageMeasurement.cpp
MinVoltageMeasurement.cpp
OvershootMeasurement.cpp
PeriodMeasurement.cpp
PkPkVoltageMeasurement.cpp
Rise1090Measurement.cpp
Rise2080Measurement.cpp
TopMeasurement.cpp
UndershootMeasurement.cpp

scopemeasurements.cpp
92 changes: 0 additions & 92 deletions scopemeasurements/MaxVoltageMeasurement.cpp

This file was deleted.

92 changes: 0 additions & 92 deletions scopemeasurements/MinVoltageMeasurement.cpp

This file was deleted.

56 changes: 0 additions & 56 deletions scopemeasurements/MinVoltageMeasurement.h

This file was deleted.

Loading