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

Commits on May 1, 2021

  1. Fix trigger point calculations and improve off-channel handling

    @mubes
    mubes committed May 1, 2021
    Copy the full SHA
    6c7bd6f View commit details

  2. Merge pull request #446 from mubes/siglent_triggers 

    Fix trigger point calculations and improve off-channel handling
    @azonenberg
    azonenberg authored May 1, 2021
    Copy the full SHA
    aa1734c View commit details
Showing with 178 additions and 160 deletions.
  1. +173 −158 scopehal/SiglentSCPIOscilloscope.cpp
  2. +5 −2 scopehal/SiglentSCPIOscilloscope.h
Loading