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

feat(app, api, shared-data, robot-server): Add module fixtures to deck configuration #14684

Merged
merged 86 commits into from
Apr 15, 2024
Merged

feat(app, api, shared-data, robot-server): Add module fixtures to deck configuration #14684

merged 86 commits into from
Apr 15, 2024

Commits on Mar 12, 2024

  1. initial adding of modules and serial numbers

    @CaseyBatten
    CaseyBatten committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    3776fdf View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. transition server router and maintenance run to deck def v5

    @CaseyBatten
    CaseyBatten committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c36543f View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. robot server api and shared data updates to handle modules

    @CaseyBatten
    CaseyBatten committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    bceeb45 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. schema and deck def updates with addressable area logic added

    @CaseyBatten
    CaseyBatten committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ecccea0 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. remaining AA defs and module fixture updates

    @CaseyBatten
    CaseyBatten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    7f110f6 View commit details
    Browse the repository at this point in the history

  2. account for AddressableAreaLocation as valid load module location

    @CaseyBatten
    CaseyBatten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    110c745 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. validate all possible module fixture locations from API

    @CaseyBatten
    CaseyBatten committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    aca73c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. update module fixture and addressable area defs to include version nu… 

    …mber
    @CaseyBatten
    CaseyBatten committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a8b71f9 View commit details
    Browse the repository at this point in the history

  2. introduction of fixture groups to the v5 deck configuration schema

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

  3. add cutout fixtures and helpers for module fixtures

    @b-cooper
    b-cooper committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    64b5208 View commit details
    Browse the repository at this point in the history

  4. v5 ot3 deck definition fixup

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

  5. module fixtures and AA's are versioned

    @b-cooper
    b-cooper committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9e4b15c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    0ef5d70 View commit details
    Browse the repository at this point in the history

  7. test fixes and move addressable area validation to engine

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

  8. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    93ff8af View commit details
    Browse the repository at this point in the history

  9. do not provide add area for thermocycler v2

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

Commits on Mar 21, 2024

  1. validation improvements and linting fixes

    @CaseyBatten
    CaseyBatten committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    28fd16e View commit details
    Browse the repository at this point in the history

  2. add module fixtures to configurator component

    @b-cooper
    b-cooper committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    26e64bd View commit details
    Browse the repository at this point in the history

  3. persistence directory migrations v4 for new deck configuration

    @CaseyBatten
    CaseyBatten committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    4ebcade View commit details
    Browse the repository at this point in the history

  4. build up deck configurator module support

    @b-cooper
    b-cooper committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    1bbd44c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    06b8f18 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. api and robot server test fixes and engine improvements

    @CaseyBatten
    CaseyBatten committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    ea51ac1 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. confest updates with api test fixes and json corrections

    @CaseyBatten
    CaseyBatten committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    a5539a6 View commit details
    Browse the repository at this point in the history

  2. shared data lint fix

    @CaseyBatten
    CaseyBatten committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    577d709 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    9ed5339 View commit details
    Browse the repository at this point in the history

  2. remove unused configuration imports

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

  3. Merge branch 'edge' into add_modules_to_deck_config

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

  4. fixture height adjustments and type check test fixes

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

Commits on Mar 27, 2024

  1. start fixing up unit tests and only show fixtures when possible

    @b-cooper
    b-cooper committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c62525c View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. repair last add fixture modal test

    @b-cooper
    b-cooper committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    93ef32f View commit details
    Browse the repository at this point in the history

  2. start implement handle click remove for thermocycler

    @b-cooper
    b-cooper committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    d86ce7b View commit details
    Browse the repository at this point in the history

  3. configure and remove all modules from device details

    @b-cooper
    b-cooper committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    32981d9 View commit details
    Browse the repository at this point in the history

  4. list modules in table properly

    @b-cooper
    b-cooper committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    b69fdc8 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. table alignment

    @b-cooper
    b-cooper committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    35355e9 View commit details
    Browse the repository at this point in the history

  2. begin to add support in location conflict modal

    @b-cooper
    b-cooper committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    696029e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. fix module conflict calculation to unblock protocol setup

    @b-cooper
    b-cooper committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    4ea0518 View commit details
    Browse the repository at this point in the history

  2. allow location conflict to grab serial number of first matching module

    @b-cooper
    b-cooper committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    1977256 View commit details
    Browse the repository at this point in the history

  3. addressable area offsets and engine consolidation of references to lo… 

    …cation
    @CaseyBatten
    CaseyBatten committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    b2783ca View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. reformat deck configuration setup list on desktop and remove moam hel… 

    …p for flex
    @b-cooper
    b-cooper committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    746600e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    0fc0f57 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. remove multiples of a module modal from ODD and tests

    @b-cooper
    b-cooper committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1d5aaee View commit details
    Browse the repository at this point in the history

  2. fixture height calculation correction and fixture group map structure

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

  3. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f809136 View commit details
    Browse the repository at this point in the history

  4. fixture group shape update and validation

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

Commits on Apr 4, 2024

  1. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    ce8f7b3 View commit details
    Browse the repository at this point in the history

  2. update grouping to include map

    @b-cooper
    b-cooper committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    2df67ee View commit details
    Browse the repository at this point in the history

  3. fix fixture group display location

    @b-cooper
    b-cooper committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    76a4ca9 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. fixup groupings in the protocol setup, and resolving module conflicts… 

    … should remove serial number
    @b-cooper
    b-cooper committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    c7bedcd View commit details
    Browse the repository at this point in the history

  2. cleaning up across stack and test fixes

    @CaseyBatten
    CaseyBatten committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    33baf87 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    2dce8f3 View commit details
    Browse the repository at this point in the history

  4. add mag block with staging fixture

    @b-cooper
    b-cooper committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    3e52951 View commit details
    Browse the repository at this point in the history

  5. mag with staging area fe support

    @b-cooper
    b-cooper committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    b8697eb View commit details
    Browse the repository at this point in the history

  6. allow for module select in location conflict modal

    @b-cooper
    b-cooper committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    4bc2e97 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. test fixes for api and deck configuration validation

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

Commits on Apr 10, 2024

  1. clean up js lint

    @b-cooper
    b-cooper committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    562b448 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'edge' into add_modules_to_deck_config

    @b-cooper
    b-cooper committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    65582a6 View commit details
    Browse the repository at this point in the history

  3. remove double listing of modules from odd protocol hardware reqs

    @b-cooper
    b-cooper committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    52a60e8 View commit details
    Browse the repository at this point in the history

  4. deck slot test fixes to include deck config and update of tavern test… 

    … to utilize magnetic block module
    @CaseyBatten
    CaseyBatten committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    38a5a9c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    4e911c7 View commit details
    Browse the repository at this point in the history

  6. addition of missing notes key to updated tavern test

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

  7. lint corrections for app hardware and shared data

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

  8. fix up redundancies in tests for setupmodules list

    @b-cooper
    b-cooper committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c8fa3fd View commit details
    Browse the repository at this point in the history

  9. fix up broken tests in add fixture modal

    @b-cooper
    b-cooper committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6f945ff View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. clean up lint

    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a72a4a5 View commit details
    Browse the repository at this point in the history

  2. ot2 deck def and shared data test fix

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

  3. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    c80c04b View commit details
    Browse the repository at this point in the history

  4. filter for unconfigured module matches in location conflict modal

    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    921ef43 View commit details
    Browse the repository at this point in the history

  5. fix up useModuleRenderInfoById to include config in matching

    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3014bc8 View commit details
    Browse the repository at this point in the history

  6. properly filter module fixture options on choose module to configure … 

    …modal
    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    cc3bc10 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2a5daa6 View commit details
    Browse the repository at this point in the history

  8. format js

    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    711ba14 View commit details
    Browse the repository at this point in the history

  9. fix failing test

    @b-cooper
    b-cooper committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7908112 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. fix location conflict add module when fixture grouped

    @b-cooper
    b-cooper committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    4f4510f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'edge' into add_modules_to_deck_config

    @b-cooper
    b-cooper committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ce3116c View commit details
    Browse the repository at this point in the history

  3. resolve multiples of a module calibration mismatch using deck config

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

  4. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    12e7aed View commit details
    Browse the repository at this point in the history

  5. add initial support for location select in module calibration

    @b-cooper
    b-cooper committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    8afeef6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    44ec408 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. robot server deck slot standardization test correction

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

  2. Merge branch 'add_modules_to_deck_config' of https://github.com/Opent… 

    …rons/opentrons into add_modules_to_deck_config
    @CaseyBatten
    CaseyBatten committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    38bde3f View commit details
    Browse the repository at this point in the history

  3. fix deck hardware item for module fixture in wrong location

    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    43b483d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'add_modules_to_deck_config' of github.com:Opentrons/ope… 

    …ntrons into add_modules_to_deck_config
    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    38133e9 View commit details
    Browse the repository at this point in the history

  5. lint and format

    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b7e50a5 View commit details
    Browse the repository at this point in the history

  6. fix ODD dashboard deck configurator

    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    a411009 View commit details
    Browse the repository at this point in the history

  7. add fixture option should include usb port info on ODD

    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ad69388 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'edge' into add_modules_to_deck_config

    @b-cooper
    b-cooper committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    0c1759b View commit details
    Browse the repository at this point in the history