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

Commits on Dec 19, 2020

  1. Fixed copy paste error

    azonenberg committed Dec 19, 2020
    Copy the full SHA
    f5187e9 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 scopehal/Oscilloscope.cpp
2 changes: 1 addition & 1 deletion scopehal/Oscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -245,7 +245,7 @@ string Oscilloscope::SerializeConfiguration(IDTable& table)
//Basic channel info
snprintf(tmp, sizeof(tmp), " : \n");
config += tmp;
snprintf(tmp, sizeof(tmp), " id: virtual bool IsTriggerArmed(); %d\n", table.emplace(chan));
snprintf(tmp, sizeof(tmp), " id: %d\n", table.emplace(chan));
config += tmp;
snprintf(tmp, sizeof(tmp), " index: %zu\n", i);
config += tmp;