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

Commits on May 24, 2020

  1. Refactoring: folded last vestiges of Measurement class into ProtocolD… 

    …ecoder. Fixes #117.
    @azonenberg
    azonenberg committed May 24, 2020
    Copy the full SHA
    ef8cc7c View commit details
2 changes: 1 addition & 1 deletion scopehal/AntikernelLabsOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -398,7 +398,7 @@ bool AntikernelLabsOscilloscope::AcquireData(bool toQueue)
//See what the actual voltages are at the zero crossing
//TODO: this isn't the actual trigger point??
float vtrig = 0;
float trigfrac = Measurement::InterpolateTime(cap, 57, vtrig);
float trigfrac = ProtocolDecoder::InterpolateTime(cap, 57, vtrig);
cap->m_triggerPhase = -trigfrac * cap->m_timescale;

//Done, update
1 change: 0 additions & 1 deletion scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ set(SCOPEHAL_SOURCES

ProtocolDecoder.cpp
PacketDecoder.cpp
Measurement.cpp
Statistic.cpp
)

Loading