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

Commits on May 2, 2021

  1. Add proper parameter format specifier for size_t

    @fsedano
    fsedano committed May 2, 2021
    Copy the full SHA
    e8c1d97 View commit details

Commits on May 3, 2021

  1. Merge pull request #449 from fsedano/fix_format_size_t 

    Add proper parameter format specifier for size_t
    @azonenberg
    azonenberg authored May 3, 2021
    Copy the full SHA
    0fcf6d8 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 scopehal/RohdeSchwarzOscilloscope.cpp
2 changes: 1 addition & 1 deletion scopehal/RohdeSchwarzOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -348,7 +348,7 @@ void RohdeSchwarzOscilloscope::SetChannelAttenuation(size_t i, double atten)
lock_guard<recursive_mutex> lock(m_mutex);

char cmd[128];
snprintf(cmd, sizeof(cmd), "PROB%ld:SET:ATT:MAN ", m_channels[i]->GetIndex()+1);
snprintf(cmd, sizeof(cmd), "PROB%zd:SET:ATT:MAN ", m_channels[i]->GetIndex()+1);
PushFloat(cmd, atten);
}