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

feat(protocol-designer): add more labware options to PD #2634

Merged
merged 4 commits into from
Nov 7, 2018
Merged

feat(protocol-designer): add more labware options to PD #2634

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4754d7c
feat(protocol-designer): add more labware options to PD
IanLondon Nov 5, 2018
0d54092
add 48-well-plate
IanLondon Nov 6, 2018
c2f1e7d
fixup: clarify (Clear Acrylic) tube racks
IanLondon Nov 6, 2018
71abbb9
remove 24-vial-rack; clarify 0.2mL PCR strip name
IanLondon Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/docs/source/labware.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']``

Expand Down
21 changes: 15 additions & 6 deletions protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,36 +30,45 @@ 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'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how much text space you have, but it would be good to clarify that it's .2mL tubes

],
'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']
['48-well-plate', '48 Well 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
],
}

const labwareSectionOrder: Array<$Keys<typeof hardcodedLabware>> = [
'Tip Rack',
'Aluminum Block',
'Tube Rack',
'Well Plate',
'Trough',
Expand Down