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

Commits on Dec 16, 2020

  1. TektronixOscilloscope: optimized MSO6 waveform download

    @azonenberg
    azonenberg committed Dec 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9214fb6 View commit details
Showing with 29 additions and 11 deletions.
  1. +29 −11 scopehal/TektronixOscilloscope.cpp
40 changes: 29 additions & 11 deletions scopehal/TektronixOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -1486,13 +1486,8 @@ bool TektronixOscilloscope::AcquireData()

bool TektronixOscilloscope::AcquireDataMSO56(map<int, vector<WaveformBase*> >& pending_waveforms)
{
//Get record length
m_transport->SendCommand("HOR:RECO?");
size_t length = stos(m_transport->ReadReply());
m_sampleDepth = length;
m_sampleDepthValid = true;
m_transport->SendCommand("DAT:START 0");
m_transport->SendCommand(string("DAT:STOP ") + to_string(length));
//Make sure record length is valid
GetSampleDepth();

//Preamble fields (not all are used)
int byte_num;
@@ -1597,14 +1592,21 @@ bool TektronixOscilloscope::AcquireDataMSO56(map<int, vector<WaveformBase*> >& p
}

//Get the spectrum stuff
m_transport->SendCommand("DAT:WID 8"); //double precision floating point data
m_transport->SendCommand("DAT:ENC SFPB"); //IEEE754 float
bool firstSpectrum = true;
for(size_t i=0; i<m_analogChannelCount; i++)
{
auto nchan = m_spectrumChannelBase + i;
if(!IsChannelEnabled(nchan))
continue;

//Select mode
if(firstSpectrum)
{
m_transport->SendCommand("DAT:WID 8"); //double precision floating point data
m_transport->SendCommand("DAT:ENC SFPB"); //IEEE754 float
firstSpectrum = false;
}

// Set source & get preamble+data
m_transport->SendCommand(string("DAT:SOU ") + m_channels[i]->GetHwname() + "_SV_NORMAL");

@@ -1678,8 +1680,7 @@ bool TektronixOscilloscope::AcquireDataMSO56(map<int, vector<WaveformBase*> >& p
}

//Get the digital stuff
m_transport->SendCommand("DAT:WID 1"); //8 data bits per channel
m_transport->SendCommand("DAT:ENC SRI"); //signed, little endian binary
bool firstDigital = true;
for(size_t i=0; i<m_analogChannelCount; i++)
{
//Skip anything without a digital probe connected
@@ -1704,6 +1705,15 @@ bool TektronixOscilloscope::AcquireDataMSO56(map<int, vector<WaveformBase*> >& p
if(!enabled)
continue;


//Configuration
if(firstDigital)
{
m_transport->SendCommand("DAT:WID 1"); //8 data bits per channel
m_transport->SendCommand("DAT:ENC SRI"); //signed, little endian binary
firstDigital = false;
}

//Ask for all of the data
m_transport->SendCommand(string("DAT:SOU CH") + to_string(i+1) + "_DALL");

@@ -1975,6 +1985,10 @@ uint64_t TektronixOscilloscope::GetSampleDepth()
return 1;
}

//Update data read bounds
m_transport->SendCommand("DAT:START 0");
m_transport->SendCommand(string("DAT:STOP ") + to_string(m_sampleDepth));

m_sampleDepthValid = true;
return m_sampleDepth;
}
@@ -2001,6 +2015,10 @@ void TektronixOscilloscope::SetSampleDepth(uint64_t depth)
default:
break;
}

//Update data read bounds
m_transport->SendCommand("DAT:START 0");
m_transport->SendCommand(string("DAT:STOP ") + to_string(depth));
}

void TektronixOscilloscope::SetSampleRate(uint64_t rate)