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

Commits on Dec 16, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6aa7957 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cc69d1c View commit details
Showing with 553 additions and 446 deletions.
  1. +553 −442 scopehal/TektronixOscilloscope.cpp
  2. +0 −4 scopehal/TektronixOscilloscope.h
995 changes: 553 additions & 442 deletions scopehal/TektronixOscilloscope.cpp

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions scopehal/TektronixOscilloscope.h
Original file line number Diff line number Diff line change
@@ -169,10 +169,6 @@ class TektronixOscilloscope

//acquisition
bool AcquireDataMSO56(std::map<int, std::vector<WaveformBase*> >& pending_waveforms);
void Convert8BitSamples(
int64_t* offs, int64_t* durs, float* pout, int8_t* pin, float ymult, float yoff, size_t count);
void Convert8BitSamplesAVX2(
int64_t* offs, int64_t* durs, float* pout, int8_t* pin, float ymult, float yoff, size_t count);
void Convert16BitSamples(
int64_t* offs, int64_t* durs, float* pout, int16_t* pin, float ymult, float yoff, size_t count);
void Convert16BitSamplesAVX2(