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

Robot firefly #221

Merged
merged 34 commits into from
Jun 28, 2024
Merged

Robot firefly #221

merged 34 commits into from
Jun 28, 2024

Commits on Apr 3, 2024

  1. create firefly GUI and script

    @yannachen
    yannachen committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    ca577bd View commit details
    Browse the repository at this point in the history

  2. Add motor list in GUI

    @yannachen
    yannachen committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    935f6ba View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Add robot GUI

    @yannachen
    yannachen committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    1fbeeb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Merge branch 'spc-group:main' into robot_fire

    @yannachen
    yannachen authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    fed655d View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. update script

    @yannachen
    yannachen committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    78e1bea View commit details
    Browse the repository at this point in the history

  2. Add robot window to the main menu

    @yannachen
    yannachen committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7c3e350 View commit details
    Browse the repository at this point in the history

  3. use combo box instead of spin box

    @yannachen
    yannachen committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9c23e05 View commit details
    Browse the repository at this point in the history

  4. update instrument to skip firefly loading error

    @yannachen
    yannachen committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e3a4cd9 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Add motor region in GUI

    @yannachen
    yannachen committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    53bce11 View commit details
    Browse the repository at this point in the history

  2. Multiple motors work, but run_button does not work

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

Commits on Apr 11, 2024

  1. test file passes

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

  2. use macro for each robot

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

  3. update ui using macro

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

Commits on Apr 12, 2024

  1. update ui

    @yannachen
    yannachen committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0680da2 View commit details
    Browse the repository at this point in the history

  2. stuck by macros

    @yannachen
    yannachen committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ee5881f View commit details
    Browse the repository at this point in the history

  3. Add mock_macros into the test file

    @yannachen
    yannachen committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f88e7f6 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. test for multiple robots and black

    @yannachen
    yannachen committed May 28, 2024
    Configuration menu
    Copy the full SHA
    baf3e6d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into robot_fire

    @yannachen
    yannachen committed May 28, 2024
    Configuration menu
    Copy the full SHA
    41991ba View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into robot_fire

    @yannachen
    yannachen committed May 28, 2024
    Configuration menu
    Copy the full SHA
    b6da5b7 View commit details
    Browse the repository at this point in the history

  4. Update GUI after the firefly test

    @yannachen
    yannachen committed May 28, 2024
    Configuration menu
    Copy the full SHA
    b4170a8 View commit details
    Browse the repository at this point in the history

  5. Clean unused package

    @yannachen
    yannachen committed May 28, 2024
    Configuration menu
    Copy the full SHA
    9f93147 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into robot_fire

    @yannachen
    yannachen authored May 28, 2024
    Configuration menu
    Copy the full SHA
    f69c33a View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Test only one robot

    @yannachen
    yannachen committed May 29, 2024
    Configuration menu
    Copy the full SHA
    fcaba39 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'robot_fire' of github.com:yannachen/haven into robot_fire

    @yannachen
    yannachen committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2577ae9 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'main' into robot_fire

    @canismarko
    canismarko authored May 30, 2024
    Configuration menu
    Copy the full SHA
    5ad1c1c View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Use longer LOAD_TIMEOUT

    @yannachen
    yannachen committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c120b9a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'spc-group:main' into robot_fire

    @yannachen
    yannachen authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    2d04ad2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'robot_fire' of github.com:yannachen/haven into robot_fire

    @yannachen
    yannachen committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c31912f View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Merge branch 'spc-group:main' into robot_fire

    @yannachen
    yannachen authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5ad31a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Update sample numbers depending on devices

    @yannachen
    yannachen committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c14573a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'spc-group:main' into robot_fire

    @yannachen
    yannachen authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    e4497e4 View commit details
    Browse the repository at this point in the history

  3. Isort the edited files

    @yannachen
    yannachen committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    e9571b5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'robot_fire' of github.com:yannachen/haven into robot_fire

    @yannachen
    yannachen committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    862491e View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Delete duplicate codes

    @yannachen
    yannachen committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    69b757c View commit details
    Browse the repository at this point in the history