Navigation Menu

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-pico-bridge
base: 4ef45a37205d
Choose a base ref
...
head repository: ngscopeclient/scopehal-pico-bridge
compare: 6bd2c1a25d81
Choose a head ref
  • 7 commits
  • 5 files changed
  • 3 contributors

Commits on May 13, 2021

  1. WIP: ps3000a support

    @noopwafel
    noopwafel committed May 13, 2021
    Copy the full SHA
    542e005 View commit details
    Browse the repository at this point in the history

  2. CMakeLists add MSYS2 Mingw64 support

    @bvernoux @noopwafel
    bvernoux authored and noopwafel committed May 13, 2021
    Copy the full SHA
    f5b2267 View commit details
    Browse the repository at this point in the history

  3. Update code from master upstream (https://github.com/azonenberg/scope… 

    …hal-pico-bridge)
    @bvernoux @noopwafel
    bvernoux authored and noopwafel committed May 13, 2021
    Copy the full SHA
    37d3eee View commit details
    Browse the repository at this point in the history

  4. Replace usleep(..) by std::this_thread::sleep_for(std::chrono::micros… 

    …econds(..))
    @bvernoux @noopwafel
    bvernoux authored and noopwafel committed May 13, 2021
    Copy the full SHA
    f9eb788 View commit details
    Browse the repository at this point in the history

  5. fix Linux paths in cmake

    @noopwafel
    noopwafel committed May 13, 2021
    Copy the full SHA
    3acae89 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. Merge branch 'master' into master

    @azonenberg
    azonenberg committed May 15, 2021
    Copy the full SHA
    b5ff075 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from noopwafel/master 

    add 3000-series support
    @azonenberg
    azonenberg committed May 15, 2021
    Copy the full SHA
    6bd2c1a View commit details
    Browse the repository at this point in the history