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

Commits on Sep 15, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a12152c View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 scopehal/PulseWidthTrigger.cpp
  2. +1 −1 scopehal/PulseWidthTrigger.h
2 changes: 1 addition & 1 deletion scopehal/PulseWidthTrigger.cpp
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ PulseWidthTrigger::PulseWidthTrigger(Oscilloscope* scope)
m_parameters[m_widthtypename].AddEnumValue("Less than", WIDTH_LESS);
m_parameters[m_widthtypename].AddEnumValue("Greater than", WIDTH_GREATER);
m_parameters[m_widthtypename].AddEnumValue("Between", WIDTH_BETWEEN);
m_parameters[m_widthtypename].AddEnumValue("Outside", WIDTH_OUTSIDE);
m_parameters[m_widthtypename].AddEnumValue("Not between", WIDTH_NOT_BETWEEN);
}

PulseWidthTrigger::~PulseWidthTrigger()
2 changes: 1 addition & 1 deletion scopehal/PulseWidthTrigger.h
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ class PulseWidthTrigger : public EdgeTrigger
WIDTH_LESS,
WIDTH_GREATER,
WIDTH_BETWEEN,
WIDTH_OUTSIDE
WIDTH_NOT_BETWEEN
};

static std::string GetTriggerName();