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

Commits on May 25, 2020

  1. Added rigol

    x44203 committed May 25, 2020
    Copy the full SHA
    f09f1a4 View commit details
  2. rigol triggers

    x44203 committed May 25, 2020
    Copy the full SHA
    68cbf30 View commit details
  3. rigol stuff

    x44203 committed May 25, 2020
    Copy the full SHA
    6eced0e View commit details
  4. removed debug statements

    x44203 committed May 25, 2020
    Copy the full SHA
    14800e7 View commit details
  5. Timebase setting

    x44203 committed May 25, 2020
    Copy the full SHA
    116870b View commit details

Commits on May 26, 2020

  1. reformat

    x44203 committed May 26, 2020
    Copy the full SHA
    feb09b6 View commit details
  2. reformat

    x44203 committed May 26, 2020
    Copy the full SHA
    be5ec9d View commit details
  3. reformat

    x44203 committed May 26, 2020
    Copy the full SHA
    c425937 View commit details
  4. formatting fixed

    x44203 committed May 26, 2020
    Copy the full SHA
    4186d52 View commit details
  5. deleted clang

    x44203 committed May 26, 2020
    Copy the full SHA
    4fe49ef View commit details
  6. Copy the full SHA
    5ae3ed9 View commit details
  7. added m_ to members

    x44203 committed May 26, 2020
    Copy the full SHA
    8180754 View commit details
  8. name fixes

    x44203 committed May 26, 2020
    Copy the full SHA
    09f5b62 View commit details
  9. Merge pull request #123 from x44203/rigol

    Rigol
    azonenberg authored May 26, 2020
    Copy the full SHA
    54d528c View commit details
Showing with 390 additions and 70 deletions.
  1. +5 −0 .vscode/settings.json
  2. +367 −68 scopehal/RigolOscilloscope.cpp
  3. +17 −1 scopehal/RigolOscilloscope.h
  4. +1 −1 xptools
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"mutex": "cpp"
}
}
Loading