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

Commits on Jan 6, 2021

  1. Copy the full SHA
    40d934d View commit details
Showing with 21 additions and 0 deletions.
  1. +18 −0 scopeprotocols/UpsampleFilter.cpp
  2. +3 −0 scopeprotocols/UpsampleFilter.h
18 changes: 18 additions & 0 deletions scopeprotocols/UpsampleFilter.cpp
Original file line number Diff line number Diff line change
@@ -115,6 +115,24 @@ bool UpsampleFilter::NeedsConfig()
return true;
}

double UpsampleFilter::GetOffset()
{
auto chan = m_inputs[0].m_channel;
if(chan == NULL)
return 0;
else
return chan->GetOffset();
}

double UpsampleFilter::GetVoltageRange()
{
auto chan = m_inputs[0].m_channel;
if(chan == NULL)
return 0;
else
return chan->GetVoltageRange();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Actual decoder logic

3 changes: 3 additions & 0 deletions scopeprotocols/UpsampleFilter.h
Original file line number Diff line number Diff line change
@@ -45,6 +45,9 @@ class UpsampleFilter : public Filter
virtual bool NeedsConfig();
virtual bool IsOverlay();

virtual double GetOffset();
virtual double GetVoltageRange();

static std::string GetProtocolName();
virtual void SetDefaultName();