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-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 82cfac18e7fe
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04173e764f29
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 8, 2021

  1. Updated submodules

    azonenberg committed Apr 8, 2021
    Copy the full SHA
    bb3b775 View commit details
  2. Copy the full SHA
    2b431a9 View commit details
  3. Copy the full SHA
    04173e7 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 doc
  2. +1 −1 lib
  3. +1 −1 src/glscopeclient/HistoryWindow.cpp
  4. +1 −1 src/glscopeclient/OscilloscopeWindow.cpp
2 changes: 1 addition & 1 deletion doc
2 changes: 1 addition & 1 deletion src/glscopeclient/HistoryWindow.cpp
Original file line number Diff line number Diff line change
@@ -397,7 +397,7 @@ void HistoryWindow::SerializeWaveforms(string dir, IDTable& table)
config += tmp;
snprintf(tmp, sizeof(tmp), " timescale: %ld\n", wave->m_timescale);
config += tmp;
snprintf(tmp, sizeof(tmp), " trigphase: %zu\n", wave->m_triggerPhase);
snprintf(tmp, sizeof(tmp), " trigphase: %zd\n", wave->m_triggerPhase);
config += tmp;

//Save channel data
2 changes: 1 addition & 1 deletion src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -1005,7 +1005,7 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
cap->m_triggerPhase = ch["trigphase"].as<float>() * 1000;
}
else
cap->m_triggerPhase = ch["trigphase"].as<long>();
cap->m_triggerPhase = ch["trigphase"].as<long long>();

chan->Detach(stream);
chan->SetData(cap, stream);