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: DSPGroup/Python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DSPGroup/Python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sas
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 7 files changed
  • 2 contributors

Commits on Feb 26, 2017

  1. changed the addresses to fit my computer

    @sas011752342
    sas011752342 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    1a21812 View commit details
    Browse the repository at this point in the history

  2. fixed apb_write_reg function

    @sas011752342
    sas011752342 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    6e47bd3 View commit details
    Browse the repository at this point in the history

  3. corrections in test.py

    @sas011752342
    sas011752342 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    c40d3e3 View commit details
    Browse the repository at this point in the history

  4. addresses

    @sas011752342
    sas011752342 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    86b9a32 View commit details
    Browse the repository at this point in the history

  5. addded Bisset's termotron

    @sas011752342
    sas011752342 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    b26b402 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. new tests

    @sas011752342
    sas011752342 committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    0a2ef6f View commit details
    Browse the repository at this point in the history

  2. gpib address updated

    @sas011752342
    sas011752342 committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    0d0ebc1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/master' into sas 

    # Conflicts:
#	.gitignore
#	init.py
#	test1.py
    valab committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    d56eba6 View commit details
    Browse the repository at this point in the history

  4. no need to send RESOURCE_MANAGER

    valab committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    c01b4c3 View commit details
    Browse the repository at this point in the history

  5. Lauterbach bug fixed

    valab committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    7f583aa View commit details
    Browse the repository at this point in the history
Loading