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: d8b29ef80ddd
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 99468ea2154c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 26, 2020

  1. acquire data work

    @four0four
    four0four committed Feb 26, 2020
    Copy the full SHA
    784561a View commit details

  2. selectively merge changes from master/un-bit-rot Siglent driver

    @four0four
    four0four committed Feb 26, 2020
    Copy the full SHA
    c1dc4a9 View commit details

  3. fix-up some chunks that got lost in the merge

    @four0four
    four0four committed Feb 26, 2020
    Copy the full SHA
    99468ea View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 scopehal/SiglentSCPIOscilloscope.cpp
9 changes: 3 additions & 6 deletions scopehal/SiglentSCPIOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ void SiglentSCPIOscilloscope::DetectAnalogChannels()
{
//Siglent likes variably long model names (x, x-e, etc)
int nchans = m_model[strlen("sds120")] - '0';
//nchans = 1;
nchans = 1;
for(int i=0; i<nchans; i++)
{
//Hardware name of the channel
@@ -225,7 +225,7 @@ void SiglentSCPIOscilloscope::ReadWaveDescriptorBlock(SiglentWaveformDesc_t *des

bool SiglentSCPIOscilloscope::AcquireData(bool toQueue)
{
m_mutex.lock();
lock_guard<recursive_mutex> lock(m_mutex);

LogDebug("Acquire data\n");

@@ -246,9 +246,7 @@ bool SiglentSCPIOscilloscope::AcquireData(bool toQueue)
wavedescs.push_back(new struct SiglentWaveformDesc_t);
if(enabled[i])
{
snprintf(tmp, sizeof(tmp), "C%d:WF? DESC", i+1);
cmd = tmp;
SendCommand(cmd);
SendCommand(m_channels[i]->GetHwname() + ":WF? DESC");
ReadWaveDescriptorBlock(wavedescs[i], i);
LogDebug("name %s, number: %u\n",wavedescs[i]->InstrumentName,
wavedescs[i]->InstrumentNumber);
@@ -383,7 +381,6 @@ bool SiglentSCPIOscilloscope::AcquireData(bool toQueue)

double dt = GetTime() - start;
LogTrace("Waveform download took %.3f ms\n", dt * 1000);
m_mutex.unlock();
//Refresh protocol decoders
for(size_t i=0; i<m_channels.size(); i++)
{