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: f915f7c4ce7a
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96a17653ec30
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 27, 2020

  1. Copy the full SHA
    96a1765 View commit details
Showing with 6 additions and 1 deletion.
  1. +5 −1 scopeprotocols/TIEMeasurement.cpp
  2. +1 −0 scopeprotocols/TIEMeasurement.h
6 changes: 5 additions & 1 deletion scopeprotocols/TIEMeasurement.cpp
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@ using namespace std;

TIEMeasurement::TIEMeasurement(const string& color)
: Filter(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_CLOCK)
, m_threshname("Threshold")
{
m_yAxisUnit = Unit(Unit::UNIT_PS);

@@ -44,6 +45,9 @@ TIEMeasurement::TIEMeasurement(const string& color)
CreateInput("Golden");

m_maxTie = 1;

m_parameters[m_threshname] = FilterParameter(FilterParameter::TYPE_FLOAT, Unit(Unit::UNIT_VOLTS));
m_parameters[m_threshname].SetFloatVal(0);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -118,7 +122,7 @@ void TIEMeasurement::Refresh()

//Timestamps of the edges
vector<int64_t> edges;
FindZeroCrossings(clk, 0, edges);
FindZeroCrossings(clk, m_parameters[m_threshname].GetFloatVal(), edges);

m_maxTie = 1;

1 change: 1 addition & 0 deletions scopeprotocols/TIEMeasurement.h
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@ class TIEMeasurement : public Filter

protected:
double m_maxTie;
std::string m_threshname;
};

#endif