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

Make stage synchronous if arming not started #92

Merged
merged 16 commits into from
Jun 27, 2023
Merged

Make stage synchronous if arming not started #92

merged 16 commits into from
Jun 27, 2023

Commits on Jun 13, 2023

  1. Reinstate stage and add tests

    @olliesilvester
    olliesilvester committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e363fc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Improvements to unit tests and run_functions_without_blocking

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

  2. remove unused function

    @olliesilvester
    olliesilvester committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4a61775 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Remove armed state, adjust unit tests

    @olliesilvester
    olliesilvester committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    53bd9c9 View commit details
    Browse the repository at this point in the history

  2. Reinstate stage and add tests

    @olliesilvester
    olliesilvester committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7da8905 View commit details
    Browse the repository at this point in the history

  3. Improvements to unit tests and run_functions_without_blocking

    @olliesilvester
    olliesilvester committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    3686bb6 View commit details
    Browse the repository at this point in the history

  4. remove unused function

    @olliesilvester
    olliesilvester committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ea77f42 View commit details
    Browse the repository at this point in the history

  5. Remove armed state, adjust unit tests

    @olliesilvester
    olliesilvester committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    e8e75ce View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Fix typo that should have broken arming

    @olliesilvester
    olliesilvester committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    09d4013 View commit details
    Browse the repository at this point in the history

  2. Merge branch '76_make_stage_synchronous_if_arming_not_started_rebased… 

    …' of github.com:DiamondLightSource/dodal into 76_make_stage_synchronous_if_arming_not_started_rebased
    @olliesilvester
    olliesilvester committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    9e4397b View commit details
    Browse the repository at this point in the history

  3. Remove armedstate after merge

    @olliesilvester
    olliesilvester committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    c6f0e61 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Commit nit suggestion 

    Co-authored-by: Dominic Oram <[email protected]>
    @olliesilvester @DominicOram
    olliesilvester and DominicOram authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    3dbdef5 View commit details
    Browse the repository at this point in the history

  2. Add is_armed function

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

  3. Add is_armed function

    @olliesilvester
    olliesilvester committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    52bfa8c View commit details
    Browse the repository at this point in the history

  4. Minor nit change 

    Co-authored-by: Dominic Oram <[email protected]>
    @olliesilvester @DominicOram
    olliesilvester and DominicOram authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    126cf27 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into 76_make_stage_synchronous_if_arming_not_star… 

    …ted_rebased
    @olliesilvester
    olliesilvester authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    bc45b1e View commit details
    Browse the repository at this point in the history