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

Commits on Oct 18, 2020

  1. Added default-delete copy constructor and assignment operator to Wate…

    …rfall. size_t format fixes to Agilent and Rigol drivers
    azonenberg committed Oct 18, 2020
    Copy the full SHA
    01da7b3 View commit details
Showing with 6 additions and 2 deletions.
  1. +1 −1 scopehal/AgilentOscilloscope.cpp
  2. +1 −1 scopehal/RigolOscilloscope.cpp
  3. +4 −0 scopeprotocols/Waterfall.h
2 changes: 1 addition & 1 deletion scopehal/AgilentOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -481,7 +481,7 @@ bool AgilentOscilloscope::AcquireData()
m_transport->SendCommand(":WAV:SOUR " + m_channels[i]->GetHwname());
m_transport->SendCommand(":WAV:PRE?");
string reply = m_transport->ReadReply();
sscanf(reply.c_str(), "%u,%u,%lu,%u,%lf,%lf,%lf,%lf,%lf,%lf",
sscanf(reply.c_str(), "%u,%u,%zu,%u,%lf,%lf,%lf,%lf,%lf,%lf",
&format, &type, &length, &average_count, &xincrement, &xorigin, &xreference, &yincrement, &yorigin, &yreference);

//Figure out the sample rate
2 changes: 1 addition & 1 deletion scopehal/RigolOscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -662,7 +662,7 @@ bool RigolOscilloscope::AcquireData()
string reply = m_transport->ReadReply();
//LogDebug("Preamble = %s\n", reply.c_str());
sscanf(reply.c_str(),
"%d,%d,%lu,%d,%lf,%lf,%lf,%lf,%lf,%lf",
"%d,%d,%zu,%d,%lf,%lf,%lf,%lf,%lf,%lf",
&unused1,
&unused2,
&npoints,
4 changes: 4 additions & 0 deletions scopeprotocols/Waterfall.h
Original file line number Diff line number Diff line change
@@ -41,6 +41,10 @@ class WaterfallWaveform : public WaveformBase
WaterfallWaveform(size_t width, size_t height);
virtual ~WaterfallWaveform();

//not copyable or assignable
WaterfallWaveform(const WaterfallWaveform&) =delete;
WaterfallWaveform& operator=(const WaterfallWaveform&) =delete;

float* GetData()
{ return m_outdata; }