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

Only use config server if GDA didn't supply params #496

Merged
merged 13 commits into from
Oct 25, 2024
Merged

Only use config server if GDA didn't supply params #496

merged 13 commits into from
Oct 25, 2024

Commits on Oct 14, 2024

  1. Only use config server if GDA didn't supply params

    @olliesilvester
    olliesilvester committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    dd41745 View commit details
    Browse the repository at this point in the history

  2. add test

    @olliesilvester
    olliesilvester committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    59676ac View commit details
    Browse the repository at this point in the history

  3. Address review

    @olliesilvester
    olliesilvester committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    df08194 View commit details
    Browse the repository at this point in the history

  4. Add attributes back to GridScan

    @olliesilvester
    olliesilvester committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    42d777a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'main' into 494_turn_on_experimental_features

    @olliesilvester
    olliesilvester committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    e7039e9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into 494_turn_on_experimen… 

    …tal_features
    @olliesilvester
    olliesilvester committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    1b7a536 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. More cleanly allow features to be input from GDA

    @olliesilvester
    olliesilvester committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    82a14da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into 494_turn_on_experimental_features

    @olliesilvester
    olliesilvester authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    196586e View commit details
    Browse the repository at this point in the history

  3. Fix typing

    @olliesilvester
    olliesilvester committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    3c4a882 View commit details
    Browse the repository at this point in the history

  4. typing again

    @olliesilvester
    olliesilvester committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    663c3d3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into 494_turn_on_experimental_features

    @olliesilvester
    olliesilvester authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    6993022 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Update src/mx_bluesky/hyperion/external_interaction/config_server.py 

    Co-authored-by: David Perl <david.perl@diamond.ac.uk>
    @olliesilvester @dperl-dls
    olliesilvester and dperl-dls authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0070f8e View commit details
    Browse the repository at this point in the history

  2. Update src/mx_bluesky/hyperion/external_interaction/config_server.py 

    Co-authored-by: David Perl <david.perl@diamond.ac.uk>
    @olliesilvester @dperl-dls
    olliesilvester and dperl-dls authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    dd72b9e View commit details
    Browse the repository at this point in the history