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

(#391) Create an ophyd-async ApertureScatterguard device #419

Merged
merged 33 commits into from
May 7, 2024
Merged

(#391) Create an ophyd-async ApertureScatterguard device #419

merged 33 commits into from
May 7, 2024

Commits on Mar 20, 2024

  1. ophyd-async aperture and scatterguard first attempt

    @katesmith280
    katesmith280 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    e4e5122 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. WIP help..

    @katesmith280
    katesmith280 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    adaaf77 View commit details
    Browse the repository at this point in the history

  2. ...

    @dperl-dls
    dperl-dls committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    7b376be View commit details
    Browse the repository at this point in the history

  3. work in progress, scatterguard extended motor, async/await

    @katesmith280
    katesmith280 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    241414b View commit details
    Browse the repository at this point in the history

  4. Work in progress async

    @katesmith280
    katesmith280 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    2309790 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. WIP ophyd-asyncio .connect(sim=True) for unit-tests

    @katesmith280
    katesmith280 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    661ec59 View commit details
    Browse the repository at this point in the history

  2. WIP more tests passing now we are updating position values - thanks D… 

    …avid!
    @katesmith280
    katesmith280 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7d0f304 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. WIP working on tests

    @katesmith280
    katesmith280 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    ed2b34b View commit details
    Browse the repository at this point in the history

  2. (#391) mock _move instead of set in ap_sg

    @dperl-dls
    dperl-dls committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    9650bea View commit details
    Browse the repository at this point in the history

  3. (#391) remove stray await

    @dperl-dls
    dperl-dls committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    41ca74f View commit details
    Browse the repository at this point in the history

  4. _set_raw_unsafe to asyncio.gather

    @katesmith280
    katesmith280 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    41436a3 View commit details
    Browse the repository at this point in the history

  5. tidy up unused imports and old commented code block

    @katesmith280
    katesmith280 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    32be1b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    1b94847 View commit details
    Browse the repository at this point in the history

  2. placate linter

    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    19a03bd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #394 from DiamondLightSource/hyperion_1033_clarify… 

    …_desired_transmission

Move transmission to the experiment param base class
    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    ad5ba13 View commit details
    Browse the repository at this point in the history

  4. (#391) fix logging and LUT tests

    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    2de7fa1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of github.com:DiamondLightSource/dodal

    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    b6f7373 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @dperl-dls
    dperl-dls committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    418de3d View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. WIP AsyncStatus bluseky tests

    @katesmith280
    katesmith280 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    49fa716 View commit details
    Browse the repository at this point in the history

  2. (#391) fix test

    @dperl-dls
    dperl-dls committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    7325b3b View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @katesmith280
    katesmith280 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bf1de01 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. (#391) update i03 test

    @dperl-dls
    dperl-dls committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    cedcfd2 View commit details
    Browse the repository at this point in the history

  2. (#391) tidy up tests a little

    @dperl-dls
    dperl-dls committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    5c5c97e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Remove print from tests and obseleted comment

    @katesmith280
    katesmith280 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9652718 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. update for compatability with ophyd-async breaking change 0e7e45b

    @katesmith280
    katesmith280 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    211703f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @katesmith280
    katesmith280 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    852adb6 View commit details
    Browse the repository at this point in the history

  2. Removed ExtendedMotor for Motor and changed motor_resolution to deadband

    @katesmith280
    katesmith280 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    991aaf0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. remove old comment about deadband not in epics motor

    @katesmith280
    katesmith280 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    73c1361 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. remove unnecessary if statement (no more ExtendedMotor)

    @katesmith280
    katesmith280 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    a991d2f View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @DominicOram
    DominicOram committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    3848acb View commit details
    Browse the repository at this point in the history

  2. Remove unused imports

    @DominicOram
    DominicOram committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e173bbe View commit details
    Browse the repository at this point in the history

  3. Tidy up tests a bit

    @DominicOram
    DominicOram committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1142f8b View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'main' into 391_aperture_scatterguard_ophyd_async

    @katesmith280
    katesmith280 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    b2ef997 View commit details
    Browse the repository at this point in the history