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
base: 2e8c836f3834
Choose a base ref
...
head repository: ngscopeclient/scopehal
compare: 9c196a1e84e5
Choose a head ref
  • 7 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 15, 2019

  1. Initial, broken Siglent support

    @four0four
    four0four committed Apr 15, 2019
    Copy the full SHA
    fdfdd51 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. partially working SDS support, update cmakelist

    @four0four
    four0four committed May 2, 2019
    Copy the full SHA
    dcdf786 View commit details
    Browse the repository at this point in the history

  2. Initial, broken Siglent support

    @four0four
    four0four committed May 2, 2019
    Copy the full SHA
    e6fb395 View commit details
    Browse the repository at this point in the history

  3. rebase

    @four0four
    four0four committed May 2, 2019
    Copy the full SHA
    3802f3b View commit details
    Browse the repository at this point in the history

Commits on May 4, 2019

  1. Rebase, mostly

    @four0four
    four0four committed May 4, 2019
    Copy the full SHA
    132f4e9 View commit details
    Browse the repository at this point in the history

  2. less crashy siglent, removed options detect from shared ctor

    @four0four
    four0four committed May 4, 2019
    Copy the full SHA
    7ffcfab View commit details
    Browse the repository at this point in the history

Commits on May 5, 2019

  1. Merge pull request #65 from azonenberg/Siglent-WIP 

    some changes in the upper LeCroyOscilloscope class for Siglent compat
    @azonenberg
    azonenberg committed May 5, 2019
    Copy the full SHA
    9c196a1 View commit details
    Browse the repository at this point in the history