From 4754d7c23453d8531ff08088af4fb3d86542a3d2 Mon Sep 17 00:00:00 2001 From: IanLondon Date: Mon, 5 Nov 2018 10:00:51 -0500 Subject: [PATCH 1/4] feat(protocol-designer): add more labware options to PD * fix labware typo in API docs Closes #2583 --- api/docs/source/labware.rst | 4 ++-- .../LabwareSelectionModal.js | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/api/docs/source/labware.rst b/api/docs/source/labware.rst index 8c654ac72c0..844496fa527 100644 --- a/api/docs/source/labware.rst +++ b/api/docs/source/labware.rst @@ -66,13 +66,13 @@ Opentrons Containers Tipracks ======== -opentrons-300ul-tiprack +opentrons-tiprack-300ul ----------------------- Tiprack for both a 50ul and 300ul pipette (single or 8-channel) .. code-block:: python - labware.load('opentrons-300ul-tiprack', slot) + labware.load('opentrons-tiprack-300ul', slot) **Accessing Tips:** *single channel* ``['A1']-['H12']``, *8-channel* ``['A1']-['A12']`` diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js index 25b72e50d5a..e89e00e7ef3 100644 --- a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js +++ b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js @@ -30,29 +30,36 @@ const hardcodedLabware = { ['tiprack-1000ul', '1000µL Tip Rack', 'Tiprack-200ul'], ['tiprack-1000ul-chem', '10x10 1000µL Chem-Tip Rack', 'Tiprack-1000ul-chem'], ], + 'Aluminum Block': [ + ['opentrons-aluminum-block-2ml-eppendorf', 'Aluminum Block - 2mL Eppendorf Tubes'], + ['opentrons-aluminum-block-2ml-screwcap', 'Aluminum Block - 2mL Screw Cap Tubes'], + ['opentrons-aluminum-block-96-PCR-plate', 'Aluminum Block - 96 PCR Plate'], + ['opentrons-aluminum-block-PCR-strips-200ul', 'Aluminum Block - PCR Strips'], + ], 'Tube Rack': [ + ['opentrons-tuberack-2ml-eppendorf', '2mL Eppendorf Tube Rack (4-in-1 Rack)'], + ['opentrons-tuberack-2ml-screwcap', '2mL Screw Cap Tube Rack (4-in-1 Rack)'], + ['opentrons-tuberack-15ml', '15mL Tube Rack (4-in-1 Rack)'], + ['opentrons-tuberack-50ml', '50mL Tube Rack (4-in-1 Rack)'], + ['opentrons-tuberack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (4-in-1 Rack)', 'Opentrons-4-in-1-tuberack-15-50'], ['tube-rack-.75ml', '0.75mL Tube Rack', 'Tuberack-075ml'], ['tube-rack-2ml', '2mL Tube Rack', 'Tuberack-2ml'], - ['24-vial-rack', '3.5mL Tube Rack'], - ['opentrons-tuberack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (4-in-1 Rack)', 'Opentrons-4-in-1-tuberack-15-50'], ['tube-rack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (Clear Acrylic)', 'Tuberack-15-50ml'], + ['24-vial-rack', '3.5mL Tube Rack'], ], 'Well Plate': [ ['96-deep-well', '96 Deep Well Plate', '96-Deep-Well'], ['96-flat', '96 Flat', '96-PCR-Flatt'], ['96-PCR-flat', '96 Well PCR Plate (Flat)', '96-PCR-Flatt'], ['96-PCR-tall', '96 Well PCR Plate (Tall)', '96-PCR-Tall'], + ['PCR-strip-tall', 'PCR Strip (Tall)'], ['384-plate', '384 Well Plate', '384-plate'], ['12-well-plate', '12 Well Plate'], ['24-well-plate', '24 Well Plate'], - // ['rigaku-compact-crystallization-plate', 'Rigaku Compact Crystallization Plate'] ], 'Trough': [ ['trough-12row', '12-row Trough', 'Trough-12row'], ], - // 'PCR Strip': [ - // ['PCR-strip-tall', 'PCR Strip Tall', '96-PCR-Strip'] - // ], 'Trash': [ ['trash-box', 'Trash Box'], // no container img ], @@ -60,6 +67,7 @@ const hardcodedLabware = { const labwareSectionOrder: Array<$Keys> = [ 'Tip Rack', + 'Aluminum Block', 'Tube Rack', 'Well Plate', 'Trough', From 0d54092a2dd4759c67eff84d6c676f18a4ec5032 Mon Sep 17 00:00:00 2001 From: IanLondon Date: Tue, 6 Nov 2018 10:23:02 -0500 Subject: [PATCH 2/4] add 48-well-plate --- .../components/LabwareSelectionModal/LabwareSelectionModal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js index e89e00e7ef3..cccfc4cd43a 100644 --- a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js +++ b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js @@ -56,6 +56,7 @@ const hardcodedLabware = { ['384-plate', '384 Well Plate', '384-plate'], ['12-well-plate', '12 Well Plate'], ['24-well-plate', '24 Well Plate'], + ['48-well-plate', '48 Well Plate'], ], 'Trough': [ ['trough-12row', '12-row Trough', 'Trough-12row'], From c2f1e7d2fee91782891a0a1244e27bb9b1c584da Mon Sep 17 00:00:00 2001 From: IanLondon Date: Tue, 6 Nov 2018 17:06:07 -0500 Subject: [PATCH 3/4] fixup: clarify (Clear Acrylic) tube racks --- .../LabwareSelectionModal/LabwareSelectionModal.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js index cccfc4cd43a..6c9edb0b108 100644 --- a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js +++ b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js @@ -42,10 +42,10 @@ const hardcodedLabware = { ['opentrons-tuberack-15ml', '15mL Tube Rack (4-in-1 Rack)'], ['opentrons-tuberack-50ml', '50mL Tube Rack (4-in-1 Rack)'], ['opentrons-tuberack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (4-in-1 Rack)', 'Opentrons-4-in-1-tuberack-15-50'], - ['tube-rack-.75ml', '0.75mL Tube Rack', 'Tuberack-075ml'], - ['tube-rack-2ml', '2mL Tube Rack', 'Tuberack-2ml'], + ['tube-rack-.75ml', '0.75mL Tube Rack (Clear Acrylic)', 'Tuberack-075ml'], + ['tube-rack-2ml', '2mL Tube Rack (Clear Acrylic)', 'Tuberack-2ml'], ['tube-rack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (Clear Acrylic)', 'Tuberack-15-50ml'], - ['24-vial-rack', '3.5mL Tube Rack'], + ['24-vial-rack', '3.5mL Tube Rack (Clear Acrylic)'], ], 'Well Plate': [ ['96-deep-well', '96 Deep Well Plate', '96-Deep-Well'], From 71abbb94c2e8f5d4ce045621a48f882fa7a45239 Mon Sep 17 00:00:00 2001 From: IanLondon Date: Wed, 7 Nov 2018 15:55:19 -0500 Subject: [PATCH 4/4] remove 24-vial-rack; clarify 0.2mL PCR strip name --- .../components/LabwareSelectionModal/LabwareSelectionModal.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js index 6c9edb0b108..026e6228d8c 100644 --- a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js +++ b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js @@ -34,7 +34,7 @@ const hardcodedLabware = { ['opentrons-aluminum-block-2ml-eppendorf', 'Aluminum Block - 2mL Eppendorf Tubes'], ['opentrons-aluminum-block-2ml-screwcap', 'Aluminum Block - 2mL Screw Cap Tubes'], ['opentrons-aluminum-block-96-PCR-plate', 'Aluminum Block - 96 PCR Plate'], - ['opentrons-aluminum-block-PCR-strips-200ul', 'Aluminum Block - PCR Strips'], + ['opentrons-aluminum-block-PCR-strips-200ul', 'Aluminum Block - 0.2mL PCR Strips'], ], 'Tube Rack': [ ['opentrons-tuberack-2ml-eppendorf', '2mL Eppendorf Tube Rack (4-in-1 Rack)'], @@ -45,7 +45,6 @@ const hardcodedLabware = { ['tube-rack-.75ml', '0.75mL Tube Rack (Clear Acrylic)', 'Tuberack-075ml'], ['tube-rack-2ml', '2mL Tube Rack (Clear Acrylic)', 'Tuberack-2ml'], ['tube-rack-15_50ml', '15mL x 6 + 50mL x 4 Tube Rack (Clear Acrylic)', 'Tuberack-15-50ml'], - ['24-vial-rack', '3.5mL Tube Rack (Clear Acrylic)'], ], 'Well Plate': [ ['96-deep-well', '96 Deep Well Plate', '96-Deep-Well'],