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

Oxford Triton: Add control of pumps and temperature channels #5316

Merged
merged 19 commits into from
Aug 24, 2023
Merged

Oxford Triton: Add control of pumps and temperature channels #5316

merged 19 commits into from
Aug 24, 2023

Commits on Jun 7, 2023

  1. Added pump and thermometer state parameters

    @FredWolff
    FredWolff committed Jun 7, 2023
    1 Configuration menu
    Copy the full SHA
    598927b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Added params pump_speed and pid-p,-i,-d

    @FredWolff
    FredWolff committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    416d390 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. debugging

    @FredWolff
    FredWolff committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6889f8e View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. refactor

    @FredWolff
    FredWolff committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    16d1188 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Small changes after initial testing

    @qdevtriton11
    qdevtriton11 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    93c73dc View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. After testing

    @qdevtriton11
    qdevtriton11 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    076244e View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. refactor

    @FredWolff
    FredWolff committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    b9bf74a View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge qcodes master into development branch

    @FredWolff
    FredWolff committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    0d5eb11 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Reverting formatting

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    46e05fd View commit details
    Browse the repository at this point in the history

  2. Added file for the changelog

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    fb32da6 View commit details
    Browse the repository at this point in the history

  3. Added some documentation for OxfordTriton

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    77b14a0 View commit details
    Browse the repository at this point in the history

  4. Added some documentation for OxfordTriton

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    3a661a8 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    596449d View commit details
    Browse the repository at this point in the history

  6. fixed errors after pull request testing unrelated to Black

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    8449112 View commit details
    Browse the repository at this point in the history

  7. Formatting with Black

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e5d734d View commit details
    Browse the repository at this point in the history

  8. Changed the name of changelog file

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    fcfa823 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into add_control_of_pumps_and_temperature_channels

    @FredWolff
    FredWolff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    8be4ac5 View commit details
    Browse the repository at this point in the history

  10. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    024dbae View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Removed types from documentation

    @FredWolff
    FredWolff committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    1723b01 View commit details
    Browse the repository at this point in the history