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

Commits on May 9, 2021

  1. fix arguments to variadic functions to be c strings rather than std::… 

    …string
    @xzcvczx
    xzcvczx committed May 9, 2021
    Copy the full SHA
    c386a3b View commit details

  2. Merge pull request #468 from xzcvczx/c_strfixes 

    fix arguments to variadic functions to be c strings rather than std::string
    @azonenberg
    azonenberg authored May 9, 2021

    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
    a4b86a0 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 scopehal/SiglentSCPIOscilloscope.cpp
10 changes: 5 additions & 5 deletions scopehal/SiglentSCPIOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -898,7 +898,7 @@ void SiglentSCPIOscilloscope::RequestWaveforms(bool* enabled, uint32_t num_seque
//If a multi-segment capture, ask for the trigger time data
if((num_sequences > 1) && !sent_wavetime)
{
sendOnly("%s:HISTORY TIME?", m_channels[i]->GetHwname());
sendOnly("%s:HISTORY TIME?", m_channels[i]->GetHwname().c_str());
sent_wavetime = true;
}

@@ -2684,19 +2684,19 @@ void SiglentSCPIOscilloscope::PushCondition(const string& path, Trigger::Conditi
switch(cond)
{
case Trigger::CONDITION_LESS:
sendOnly("%s:LIMIT LESSTHAN", path);
sendOnly("%s:LIMIT LESSTHAN", path.c_str());
break;

case Trigger::CONDITION_GREATER:
sendOnly("%s:LIMIT GREATERTHAN", path);
sendOnly("%s:LIMIT GREATERTHAN", path.c_str());
break;

case Trigger::CONDITION_BETWEEN:
sendOnly("%s:LIMIT INNER", path);
sendOnly("%s:LIMIT INNER", path.c_str());
break;

case Trigger::CONDITION_NOT_BETWEEN:
sendOnly("%s:LIMIT OUTER", path);
sendOnly("%s:LIMIT OUTER", path.c_str());
break;

//Other values are not legal here, it seems