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

Commits on Jun 11, 2020

  1. "VBS?" -> "VBS" for non-query

    @tomverbeure
    tomverbeure committed Jun 11, 2020
    Copy the full SHA
    38844f9 View commit details

  2. More "VBS?" -> "VBS"

    @tomverbeure
    tomverbeure committed Jun 11, 2020
    Copy the full SHA
    39e7bce View commit details

  3. Merge pull request #147 from tomverbeure/vbs_command 

    "VBS?" -> "VBS" for non-query
    @azonenberg
    azonenberg authored Jun 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c47cd0 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 scopehal/LeCroyOscilloscope.cpp
12 changes: 6 additions & 6 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ void LeCroyOscilloscope::SharedCtorInit()
m_transport->SendCommand("COMM_FORMAT DEF9,BYTE,BIN");

//Always use "max memory" config for setting sample depth
m_transport->SendCommand("VBS? 'app.Acquisition.Horizontal.Maximize=\"SetMaximumMemory\"'");
m_transport->SendCommand("VBS 'app.Acquisition.Horizontal.Maximize=\"SetMaximumMemory\"'");

//Disable channel interleaving until we support this properly
m_transport->SendCommand("COMBINE_CHANNELS 1");
@@ -492,13 +492,13 @@ void LeCroyOscilloscope::EnableChannel(size_t i)
}

if(!anyDigitalEnabled)
m_transport->SendCommand("VBS? 'app.LogicAnalyzer.Digital1.UseGrid=\"YT1\"'");
m_transport->SendCommand("VBS 'app.LogicAnalyzer.Digital1.UseGrid=\"YT1\"'");

//Enable this channel on the hardware
m_transport->SendCommand(string("VBS? 'app.LogicAnalyzer.Digital1.") + m_channels[i]->GetHwname() + " = 1'");
m_transport->SendCommand(string("VBS 'app.LogicAnalyzer.Digital1.") + m_channels[i]->GetHwname() + " = 1'");
char tmp[128];
size_t nbit = (i - m_digitalChannels[0]->GetIndex());
snprintf(tmp, sizeof(tmp), "VBS? 'app.LogicAnalyzer.Digital1.BitIndex%zu = %zu'", nbit, nbit);
snprintf(tmp, sizeof(tmp), "VBS 'app.LogicAnalyzer.Digital1.BitIndex%zu = %zu'", nbit, nbit);
m_transport->SendCommand(tmp);
}

@@ -537,10 +537,10 @@ void LeCroyOscilloscope::DisableChannel(size_t i)
}

if(!anyDigitalEnabled)
m_transport->SendCommand("VBS? 'app.LogicAnalyzer.Digital1.UseGrid=\"NotOnGrid\"'");
m_transport->SendCommand("VBS 'app.LogicAnalyzer.Digital1.UseGrid=\"NotOnGrid\"'");

//Disable this channel
m_transport->SendCommand(string("VBS? 'app.LogicAnalyzer.Digital1.") + m_channels[i]->GetHwname() + " = 0'");
m_transport->SendCommand(string("VBS 'app.LogicAnalyzer.Digital1.") + m_channels[i]->GetHwname() + " = 0'");
}
}