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

Commits on Jul 29, 2020

  1. Copy the full SHA
    e8c8c06 View commit details
Showing with 6 additions and 0 deletions.
  1. +4 −0 scopehal/ProtocolDecoder.h
  2. +2 −0 scopeprotocols/DeEmbedDecoder.cpp
4 changes: 4 additions & 0 deletions scopehal/ProtocolDecoder.h
Original file line number Diff line number Diff line change
@@ -70,6 +70,10 @@ class ProtocolDecoderParameter
ParameterTypes GetType()
{ return m_type; }

//File filters for TYPE_FILENAME (otherwise ignored)
std::string m_fileFilterMask;
std::string m_fileFilterName;

protected:
ParameterTypes m_type;

2 changes: 2 additions & 0 deletions scopeprotocols/DeEmbedDecoder.cpp
Original file line number Diff line number Diff line change
@@ -45,6 +45,8 @@ DeEmbedDecoder::DeEmbedDecoder(string color)

m_fname = "SxP Path";
m_parameters[m_fname] = ProtocolDecoderParameter(ProtocolDecoderParameter::TYPE_FILENAME);
m_parameters[m_fname].m_fileFilterMask = "*.s2p";
m_parameters[m_fname].m_fileFilterName = "Touchstone S-parameter files (*.s2p)";
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////