Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/simulated instruments #859

Merged
merged 46 commits into from
Dec 6, 2017
Merged

Feature/simulated instruments #859

merged 46 commits into from
Dec 6, 2017

Commits on Nov 6, 2017

  1. style: PEP8 and type hints

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    fc50fd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. [WIP] develop some mocking system

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    0e46f8a View commit details
    Browse the repository at this point in the history

  2. Make all validators expose valid values

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    afd8641 View commit details
    Browse the repository at this point in the history

  3. add tests for XX.valid_values

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    27d9ccb View commit details
    Browse the repository at this point in the history

  4. fix two mypy errors

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    73bc419 View commit details
    Browse the repository at this point in the history

  5. fix a bug discovered by codacy

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    344b1c3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'validators/expose_valid_vals' into driver/MercuryiPS

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    db98f05 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. [WIP] Make new mocking system for SCPI instruments

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    4197bea View commit details
    Browse the repository at this point in the history

  2. make VISAInstrument take visalib as argument

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    831f05d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2017

  1. Introduce PyVISA-sim as a means to mock + clean up

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    c7397a6 View commit details
    Browse the repository at this point in the history

  2. remove mocking.py from this branch

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    17e0f18 View commit details
    Browse the repository at this point in the history

  3. remove base.py from mockers in this branch

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    97fce59 View commit details
    Browse the repository at this point in the history

  4. Apply PEP8 to test_ami430.py

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    8a4afc8 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2017

  1. make folder for driver tests, move the one we have

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    9519ad6 View commit details
    Browse the repository at this point in the history

  2. Make tests pass, deprecate old non-standard backend selection

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    a2a4354 View commit details
    Browse the repository at this point in the history

  3. rename a folder

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    81e4910 View commit details
    Browse the repository at this point in the history

  4. add logging to visa.py (ours, in instruments)

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    84d5af7 View commit details
    Browse the repository at this point in the history

  5. add module level logger and make pyvisa-sim not sleep

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    92a464b View commit details
    Browse the repository at this point in the history

  6. add more properties to simulated instrument

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    a720b9b View commit details
    Browse the repository at this point in the history

  7. PEP8

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    ff79933 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. make our visa log the instrument name

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    b629b08 View commit details
    Browse the repository at this point in the history

  2. expose three simulated AMI430's (one per axis)

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    fdfa0c7 View commit details
    Browse the repository at this point in the history

  3. add test for AMI430 using PyVISA-sim backend

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    65153b1 View commit details
    Browse the repository at this point in the history

  4. [MILESTONE] Finish PyVISA-sim test of AMI430

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    0e74dd1 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2017

  1. add __init__.py to sims folder

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    ecc1812 View commit details
    Browse the repository at this point in the history

  2. remove the old AMI430 test

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    97644b7 View commit details
    Browse the repository at this point in the history

  3. add pyvisa-sim to test_requirements.txt 

    Let's give Travis a fair chance to test this
    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    54f57b8 View commit details
    Browse the repository at this point in the history

  4. make pyvisa-sim instruments respond to writes and remove a setter

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    fe88e82 View commit details
    Browse the repository at this point in the history

  5. only set write.termination for simulated instruments

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    ec64668 View commit details
    Browse the repository at this point in the history

  6. remove debug line from driver

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    407107d View commit details
    Browse the repository at this point in the history

  7. remove all traces of old mocking system 

    Remove the `testing` kwarg from the codebase. Remove mocker classes.
    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    1f7eef3 View commit details
    Browse the repository at this point in the history

  8. rename the test for ami430

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    3b9fabb View commit details
    Browse the repository at this point in the history

  9. remove last remaining traces of testing

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    ac97517 View commit details
    Browse the repository at this point in the history

  10. refactor: most elegantly refactor the IPToVisa __init__

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    0552837 View commit details
    Browse the repository at this point in the history

  11. change a multi-line string to a comment

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    c51999b View commit details
    Browse the repository at this point in the history

  12. add a test for the visa backend warning

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    c1b1baa View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2017

  1. Merge branch 'master' into feature/simulated_instruments

    @jenshnielsen
    jenshnielsen authored Nov 30, 2017
    Configuration menu
    Copy the full SHA
    b5660b6 View commit details
    Browse the repository at this point in the history

  2. use module level logging

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    1372748 View commit details
    Browse the repository at this point in the history

  3. remove print call

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    25f2b1f View commit details
    Browse the repository at this point in the history

  4. update docstring for valid_values

    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    e7addd9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/simulated_instruments' of github.com:WilliamHPN… 

    …ielsen/Qcodes into feature/simulated_instruments
    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    37914d8 View commit details
    Browse the repository at this point in the history

  6. update driver tutorial notebook 

    update the Creating Instrument Drivers notebook to be correct and to
mention simulated instruments
    @WilliamHPNielsen
    WilliamHPNielsen committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    f86b556 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. add an example notebook on simulated instruments

    @WilliamHPNielsen
    WilliamHPNielsen committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    5780753 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. make device_clear a NOOP for simulated instruments

    @WilliamHPNielsen
    WilliamHPNielsen committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    42d82a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/simulated_instruments

    @WilliamHPNielsen
    WilliamHPNielsen authored Dec 5, 2017
    Configuration menu
    Copy the full SHA
    1f1c7a4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/simulated_instruments

    @WilliamHPNielsen
    WilliamHPNielsen authored Dec 5, 2017
    Configuration menu
    Copy the full SHA
    2267bb7 View commit details
    Browse the repository at this point in the history