Skip to content

Fixes for Agilent DSO-X 2022A #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for Agilent DSO-X 2022A #1015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
187c64e
AgilentOscilloscope: Account for 8 dig ch MSO-enabled scopes
xesxen Nov 5, 2025
b926318
AgilentOscilloscope: Retry GetWaveformPreamble on failure
xesxen Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions scopehal/AgilentOscilloscope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ AgilentOscilloscope::AgilentOscilloscope(SCPITransport* transport)
// If the MSO option is enabled, add digital channels
if (options.find("MSO") != options.end())
{
m_digitalChannelCount = 16;
m_digitalChannelCount = nchans * 4;
m_digitalChannelBase = m_channels.size();
for(int i = 0; i < 16; i++)
for(unsigned int i = 0; i < m_digitalChannelCount; i++)
{
//Create the channel
auto chan = new OscilloscopeChannel(
Expand Down Expand Up @@ -632,11 +632,17 @@ vector<uint8_t> AgilentOscilloscope::GetWaveformData(string channel)
AgilentOscilloscope::WaveformPreamble AgilentOscilloscope::GetWaveformPreamble(string channel)
{
WaveformPreamble ret;
string reply;

lock_guard<recursive_mutex> lock(m_mutex);
m_transport->SendCommand(":WAV:SOUR " + channel);
m_transport->SendCommand(":WAV:PRE?");
string reply = m_transport->ReadReply();
// The DSO-X 2022A sometimes only replies '+0' which isn't documented in the Programmer's Guide. Retrying once seems
// to solve it reliably. 19 is the shortest representable string length that conforms to the sscanf format
for (int i = 0; i < 2 && reply.length() < 19; i++)
{
m_transport->SendCommand(":WAV:PRE?");
reply = m_transport->ReadReply();
}
sscanf(reply.c_str(), "%u,%u,%zu,%u,%lf,%lf,%lf,%lf,%lf,%lf",
&ret.format, &ret.type, &ret.length, &ret.average_count,
&ret.xincrement, &ret.xorigin, &ret.xreference,
Expand Down Expand Up @@ -766,15 +772,15 @@ bool AgilentOscilloscope::AcquireData()

// Fetch waveform data for each pod containing enabled channels
map<string, vector<uint8_t>> raw_waveforms;
for(int i = 0; i < 8; i++)
for(unsigned int i = 0; i < 8 && i < m_digitalChannelCount; i++)
{
if(IsChannelEnabled(i + m_digitalChannelBase))
{
raw_waveforms.insert({"POD1", GetWaveformData("POD1")});
break;
}
}
for(int i = 8; i < 16; i++)
for(unsigned int i = 8; i < 16 && i < m_digitalChannelCount; i++)
{
if(IsChannelEnabled(i + m_digitalChannelBase))
{
Expand Down