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

Commits on Sep 27, 2020

  1. Early work on support for Tek 5/6 series spectrum view channels. Can …

    …turn them on and off but not much else. See #269.
    azonenberg committed Sep 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d42ccc8 View commit details
Showing with 231 additions and 62 deletions.
  1. +28 −0 scopehal/OscilloscopeChannel.cpp
  2. +10 −0 scopehal/OscilloscopeChannel.h
  3. +170 −62 scopehal/TektronixOscilloscope.cpp
  4. +23 −0 scopehal/TektronixOscilloscope.h
28 changes: 28 additions & 0 deletions scopehal/OscilloscopeChannel.cpp
Original file line number Diff line number Diff line change
@@ -67,6 +67,34 @@ OscilloscopeChannel::OscilloscopeChannel(
AddStream("data");
}

OscilloscopeChannel::OscilloscopeChannel(
Oscilloscope* scope,
string hwname,
OscilloscopeChannel::ChannelType type,
string color,
Unit xunit,
Unit yunit,
int width,
size_t index,
bool physical)
: m_displaycolor(color)
, m_displayname(hwname)
, m_scope(scope)
, m_type(type)
, m_hwname(hwname)
, m_width(width)
, m_index(index)
, m_physical(physical)
, m_refcount(0)
, m_xAxisUnit(xunit)
, m_yAxisUnit(yunit)
{
//Create a stream for our output.
//Normal channels only have one stream.
//Special instruments like SDRs with complex output, or filters/decodes, can have arbitrarily many.
AddStream("data");
}

OscilloscopeChannel::~OscilloscopeChannel()
{
for(auto p : m_streamData)
10 changes: 10 additions & 0 deletions scopehal/OscilloscopeChannel.h
Original file line number Diff line number Diff line change
@@ -68,6 +68,16 @@ class OscilloscopeChannel
int width = 1,
size_t index = 0,
bool physical = false);
OscilloscopeChannel(
Oscilloscope* scope,
std::string hwname,
OscilloscopeChannel::ChannelType type,
std::string color,
Unit xunit,
Unit yunit,
int width = 1,
size_t index = 0,
bool physical = false);
virtual ~OscilloscopeChannel();

///Display color (any valid GDK format)
Loading