diff --git a/labware-designer/README.md b/labware-designer/README.md index 1b32a95c356e..8a2c0c9d35a4 100644 --- a/labware-designer/README.md +++ b/labware-designer/README.md @@ -1,6 +1,6 @@ # Overview -This is a simple browser tool which can be used to generate labware definitions for _regular_ labware (labware that is +This is a simple browser tool which can be used to generate labware definitions for _regular_ labware (labware that is laid out on a grid, and where all wells have consistent dimensions), or _irregular_ labware. ### What is a 'regular' labware? @@ -192,6 +192,11 @@ brand = { "brandId" is used when a definition accurately reflects several products +## Explanation of Numerical inputs +See diagram below: + +![Labware Dimension Diagram](https://user-images.githubusercontent.com/31892318/48797647-c35ffa80-ecd0-11e8-823a-e40f903a90c8.png) + ## Example Input-Output Given this sequence of commands in the console: diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js index f4df525bc211..6b9a41572df5 100644 --- a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js +++ b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.js @@ -37,12 +37,12 @@ const hardcodedLabware = { ['opentrons-aluminum-block-PCR-strips-200ul', 'Aluminum Block - 0.2mL PCR Strips'], ], 'Tube Rack': [ - ['opentrons-tuberack-1.5ml-eppendorf', '1.5mL Tube Rack (4-in-1 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'], + ['Opentrons_24_tuberack_1.5_mL_Eppendorf', '1.5mL Tube Rack (4-in-1 Rack)'], + ['Opentrons_24_tuberack_2_mL_Eppendorf', '2mL Eppendorf Tube Rack (4-in-1 Rack)'], + ['Opentrons_24_tuberack_2_mL_screwcap', '2mL Screw Cap Tube Rack (4-in-1 Rack)'], + ['Opentrons_15_tuberack_15_mL_falcon', '15mL Tube Rack (4-in-1 Rack)'], + ['Opentrons_6_tuberack_50_mL_falcon', '50mL Tube Rack (4-in-1 Rack)'], + ['Opentrons_6x15_mL_4x50_mL_tuberack', '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 (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'], diff --git a/shared-data/definitions/opentrons-tuberack-15ml.json b/shared-data/definitions/Opentrons_15_tuberack_15_mL_falcon.json similarity index 100% rename from shared-data/definitions/opentrons-tuberack-15ml.json rename to shared-data/definitions/Opentrons_15_tuberack_15_mL_falcon.json diff --git a/shared-data/definitions/opentrons-tuberack-1.5ml-eppendorf.json b/shared-data/definitions/Opentrons_24_tuberack_1.5_mL_Eppendorf.json similarity index 99% rename from shared-data/definitions/opentrons-tuberack-1.5ml-eppendorf.json rename to shared-data/definitions/Opentrons_24_tuberack_1.5_mL_Eppendorf.json index 430b1c34c31f..082fe9078264 100644 --- a/shared-data/definitions/opentrons-tuberack-1.5ml-eppendorf.json +++ b/shared-data/definitions/Opentrons_24_tuberack_1.5_mL_Eppendorf.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "opentrons-tuberack-1.5ml-eppendorf", + "name": "Opentrons_24_tuberack_1.5_mL_Eppendorf", "format": "irregular", "displayCategory": "tube-rack" }, diff --git a/shared-data/definitions/opentrons-tuberack-2ml-eppendorf.json b/shared-data/definitions/Opentrons_24_tuberack_2_mL_Eppendorf.json similarity index 99% rename from shared-data/definitions/opentrons-tuberack-2ml-eppendorf.json rename to shared-data/definitions/Opentrons_24_tuberack_2_mL_Eppendorf.json index 7256a2a482a2..8f53bcf0c2ee 100644 --- a/shared-data/definitions/opentrons-tuberack-2ml-eppendorf.json +++ b/shared-data/definitions/Opentrons_24_tuberack_2_mL_Eppendorf.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "opentrons-tuberack-2ml-eppendorf", + "name": "Opentrons_24_tuberack_2_mL-Eppendorf", "format": "irregular", "displayCategory": "tube-rack" }, @@ -308,4 +308,4 @@ "z": 43.3 } } -} \ No newline at end of file +} diff --git a/shared-data/definitions/opentrons-tuberack-2ml-screwcap.json b/shared-data/definitions/Opentrons_24_tuberack_2_mL_screwcap.json similarity index 99% rename from shared-data/definitions/opentrons-tuberack-2ml-screwcap.json rename to shared-data/definitions/Opentrons_24_tuberack_2_mL_screwcap.json index 4c6d61b58666..4189852c023e 100644 --- a/shared-data/definitions/opentrons-tuberack-2ml-screwcap.json +++ b/shared-data/definitions/Opentrons_24_tuberack_2_mL_screwcap.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "opentrons-tuberack-2ml-screwcap", + "name": "Opentrons_24_tuberack_2_mL_screwcap", "format": "irregular", "displayCategory": "tube-rack" }, @@ -308,4 +308,4 @@ "z": 45.2 } } -} \ No newline at end of file +} diff --git a/shared-data/definitions/opentrons-tuberack-50ml.json b/shared-data/definitions/Opentrons_6_tuberack_50_mL_falcon.json similarity index 96% rename from shared-data/definitions/opentrons-tuberack-50ml.json rename to shared-data/definitions/Opentrons_6_tuberack_50_mL_falcon.json index 43e617749f63..de77c3250f4a 100644 --- a/shared-data/definitions/opentrons-tuberack-50ml.json +++ b/shared-data/definitions/Opentrons_6_tuberack_50_mL_falcon.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "opentrons-tuberack-50ml", + "name": "Opentrons_6_tuberack_50_mL_falcon", "format": "irregular", "displayCategory": "tube-rack" }, @@ -86,4 +86,4 @@ "z": 7.78 } } -} \ No newline at end of file +} diff --git a/shared-data/definitions/opentrons-tuberack-15_50ml.json b/shared-data/definitions/Opentrons_6x15_mL_4x50_mL_tuberack.json similarity index 97% rename from shared-data/definitions/opentrons-tuberack-15_50ml.json rename to shared-data/definitions/Opentrons_6x15_mL_4x50_mL_tuberack.json index b6ff9a09c3fc..e48df9857c7b 100644 --- a/shared-data/definitions/opentrons-tuberack-15_50ml.json +++ b/shared-data/definitions/Opentrons_6x15_mL_4x50_mL_tuberack.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "opentrons-tuberack-15_50ml", + "name": "Opentrons_6x15_mL_4x50_mL_tuberack", "format": "irregular", "displayCategory": "tube-rack" }, @@ -136,4 +136,4 @@ "z": 10.78 } } -} \ No newline at end of file +} diff --git a/shared-data/definitions2/Opentrons_15_tuberack_15_mL_falcon.json b/shared-data/definitions2/Opentrons_15_tuberack_15_mL_falcon.json new file mode 100644 index 000000000000..9c1c0903eba5 --- /dev/null +++ b/shared-data/definitions2/Opentrons_15_tuberack_15_mL_falcon.json @@ -0,0 +1,200 @@ +{ + "ordering": [ + [ + "A1", + "B1", + "C1" + ], + [ + "A2", + "B2", + "C2" + ], + [ + "A3", + "B3", + "C3" + ], + [ + "A4", + "B4", + "C4" + ], + [ + "A5", + "B5", + "C5" + ] + ], + "otId": "01b7cd80-e8f3-11e8-b93b-5f6727dde048", + "deprecated": false, + "metadata": { + "displayLengthUnits": "mm", + "displayVolumeUnits": "mL", + "displayCategory": "tuberack", + "displayName": "Opentrons-tuberack-15-mL", + "tags": [ + "15", + "mL", + "Opentrons", + "falcon", + "tuberack" + ] + }, + "cornerOffsetFromSlot": { + "x": -6.76, + "y": -6.73, + "z": 0 + }, + "dimensions": { + "overallLength": 121, + "overallWidth": 78.75, + "overallHeight": 123.76 + }, + "parameters": { + "format": "irregular", + "isTiprack": false, + "loadName": "Opentrons_15_tuberack_15_mL_falcon" + }, + "wells": { + "C1": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 10.5, + "y": 14.38, + "z": 5.78 + }, + "B1": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 10.5, + "y": 39.38, + "z": 5.78 + }, + "A1": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 10.5, + "y": 64.38, + "z": 5.78 + }, + "C2": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 35.5, + "y": 14.38, + "z": 5.78 + }, + "B2": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 35.5, + "y": 39.38, + "z": 5.78 + }, + "A2": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 35.5, + "y": 64.38, + "z": 5.78 + }, + "C3": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 60.5, + "y": 14.38, + "z": 5.78 + }, + "B3": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 60.5, + "y": 39.38, + "z": 5.78 + }, + "A3": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 60.5, + "y": 64.38, + "z": 5.78 + }, + "C4": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 85.5, + "y": 14.38, + "z": 5.78 + }, + "B4": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 85.5, + "y": 39.38, + "z": 5.78 + }, + "A4": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 85.5, + "y": 64.38, + "z": 5.78 + }, + "C5": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 110.5, + "y": 14.38, + "z": 5.78 + }, + "B5": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 110.5, + "y": 39.38, + "z": 5.78 + }, + "A5": { + "depth": 117.98, + "diameter": 14.5, + "shape": "circular", + "totalLiquidVolume": 15, + "x": 110.5, + "y": 64.38, + "z": 5.78 + } + }, + "brand": { + "brand": "Opentrons", + "brandId": ["352096"] + } +} diff --git a/shared-data/definitions2/Opentrons_1_trash_0.85_L.json b/shared-data/definitions2/Opentrons_1_trash_0.85_L.json new file mode 100644 index 000000000000..0c975fe5de3e --- /dev/null +++ b/shared-data/definitions2/Opentrons_1_trash_0.85_L.json @@ -0,0 +1,50 @@ +{ + "ordering": [ + [ + "A1" + ] + ], + "otId": "d8ad09a0-ecfd-11e8-b073-3da0bb8daec9", + "deprecated": false, + "metadata": { + "displayCategory": "trash", + "displayVolumeUnits": "L", + "displayLengthUnits": "mm", + "displayName": "Short Fixed Trash", + "tags": [ + "trash", + "opentrons", + "short" + ] + }, + "cornerOffsetFromSlot": { + "x": 45.1, + "y": 80.38, + "z": 0 + }, + "dimensions": { + "overallLength": 172.86, + "overallWidth": 165.86, + "overallHeight": 55 + }, + "parameters": { + "format": "trash", + "isTiprack": false, + "loadName": "Opentrons_1_trash_0.85_L" + }, + "wells": { + "A1": { + "shape": "rectangular", + "length": 172.86, + "width": 165.86, + "totalLiquidVolume": 0.85, + "depth": 55, + "x": 0, + "y": 0, + "z": 0 + } + }, + "brand": { + "brand": "Opentrons" + } +} diff --git a/shared-data/definitions2/Opentrons_1_trash_1.1_L.json b/shared-data/definitions2/Opentrons_1_trash_1.1_L.json new file mode 100644 index 000000000000..68e9ad1772a6 --- /dev/null +++ b/shared-data/definitions2/Opentrons_1_trash_1.1_L.json @@ -0,0 +1,50 @@ +{ + "ordering": [ + [ + "A1" + ] + ], + "otId": "629d3b80-ecfe-11e8-b073-3da0bb8daec9", + "deprecated": false, + "metadata": { + "displayCategory": "trash", + "displayVolumeUnits": "L", + "displayLengthUnits": "mm", + "displayName": "Tall Fixed Trash", + "tags": [ + "trash", + "opentrons", + "tall" + ] + }, + "cornerOffsetFromSlot": { + "x": 45.1, + "y": 80.38, + "z": 0 + }, + "dimensions": { + "overallLength": 172.86, + "overallWidth": 165.86, + "overallHeight": 82 + }, + "parameters": { + "format": "trash", + "isTiprack": false, + "loadName": "Opentrons_1_trash_1.1_L" + }, + "wells": { + "A1": { + "shape": "rectangular", + "length": 172.86, + "width": 165.86, + "totalLiquidVolume": 1.1, + "depth": 82, + "x": 0, + "y": 0, + "z": 0 + } + }, + "brand": { + "brand": "Opentrons" + } +} diff --git a/shared-data/definitions2/Opentrons_24_tuberack_2_mL_Eppendorf.json b/shared-data/definitions2/Opentrons_24_tuberack_2_mL_Eppendorf.json new file mode 100644 index 000000000000..0833d72caaa7 --- /dev/null +++ b/shared-data/definitions2/Opentrons_24_tuberack_2_mL_Eppendorf.json @@ -0,0 +1,293 @@ +{ + "ordering": [ + [ + "A1", + "B1", + "C1", + "D1" + ], + [ + "A2", + "B2", + "C2", + "D2" + ], + [ + "A3", + "B3", + "C3", + "D3" + ], + [ + "A4", + "B4", + "C4", + "D4" + ], + [ + "A5", + "B5", + "C5", + "D5" + ], + [ + "A6", + "B6", + "C6", + "D6" + ] + ], + "otId": "b28e5eb0-e8f0-11e8-b93b-5f6727dde048", + "deprecated": false, + "metadata": { + "displayLengthUnits": "mm", + "displayVolumeUnits": "mL", + "displayCategory": "tuberack", + "displayName": "Opentrons-tuberack-2mL-snapcap", + "tags": [ + "2", + "mL", + "snapcap", + "tuberack", + "Eppendorf", + "Opentrons" + ] + }, + "cornerOffsetFromSlot": { + "x": -0.01, + "y": 0.02, + "z": 0 + }, + "dimensions": { + "overallLength": 127.75, + "overallWidth": 85.5, + "overallHeight": 79.85 + }, + "parameters": { + "format": "irregular", + "isTiprack": false, + "loadName": "Opentrons_24_tuberack_2_mL_Eppendorf" + }, + "wells": { + "D1": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 10.08, + "z": 41.27 + }, + "C1": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 29.36, + "z": 41.27 + }, + "B1": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 48.64, + "z": 41.27 + }, + "A1": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 67.92, + "z": 41.27 + }, + "D2": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 10.08, + "z": 41.27 + }, + "C2": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 29.36, + "z": 41.27 + }, + "B2": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 48.64, + "z": 41.27 + }, + "A2": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 67.92, + "z": 41.27 + }, + "D3": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 10.08, + "z": 41.27 + }, + "C3": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 29.36, + "z": 41.27 + }, + "B3": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 48.64, + "z": 41.27 + }, + "A3": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 67.92, + "z": 41.27 + }, + "D4": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 10.08, + "z": 41.27 + }, + "C4": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 29.36, + "z": 41.27 + }, + "B4": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 48.64, + "z": 41.27 + }, + "A4": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 67.92, + "z": 41.27 + }, + "D5": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 10.08, + "z": 41.27 + }, + "C5": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 29.36, + "z": 41.27 + }, + "B5": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 48.64, + "z": 41.27 + }, + "A5": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 67.92, + "z": 41.27 + }, + "D6": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 10.08, + "z": 41.27 + }, + "C6": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 29.36, + "z": 41.27 + }, + "B6": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 48.64, + "z": 41.27 + }, + "A6": { + "depth": 38.58, + "diameter": 9.9, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 67.92, + "z": 41.27 + } + }, + "brand": { + "brand": "Opentrons", + "brandId": [] + } +} diff --git a/shared-data/definitions2/Opentrons_24_tuberack_2_mL_screwcap.json b/shared-data/definitions2/Opentrons_24_tuberack_2_mL_screwcap.json new file mode 100644 index 000000000000..3b43338611c9 --- /dev/null +++ b/shared-data/definitions2/Opentrons_24_tuberack_2_mL_screwcap.json @@ -0,0 +1,292 @@ +{ + "ordering": [ + [ + "A1", + "B1", + "C1", + "D1" + ], + [ + "A2", + "B2", + "C2", + "D2" + ], + [ + "A3", + "B3", + "C3", + "D3" + ], + [ + "A4", + "B4", + "C4", + "D4" + ], + [ + "A5", + "B5", + "C5", + "D5" + ], + [ + "A6", + "B6", + "C6", + "D6" + ] + ], + "otId": "e8c55910-e8f1-11e8-b93b-5f6727dde048", + "deprecated": false, + "metadata": { + "displayLengthUnits": "mm", + "displayVolumeUnits": "mL", + "displayCategory": "tuberack", + "displayName": "Opentrons-tuberack-2mL-screwcap", + "tags": [ + "2", + "mL", + "screwcap", + "tuberack", + "Opentrons" + ] + }, + "cornerOffsetFromSlot": { + "x": -0.01, + "y": 0.02, + "z": 0 + }, + "dimensions": { + "overallLength": 127.75, + "overallWidth": 85.5, + "overallHeight": 79.85 + }, + "parameters": { + "format": "irregular", + "isTiprack": false, + "loadName": "Opentrons_24_tuberack_2_mL_screwcap" + }, + "wells": { + "D1": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 10.08, + "z": 39.05 + }, + "C1": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 29.36, + "z": 39.05 + }, + "B1": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 48.64, + "z": 39.05 + }, + "A1": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 18.21, + "y": 67.92, + "z": 39.05 + }, + "D2": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 10.08, + "z": 39.05 + }, + "C2": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 29.36, + "z": 39.05 + }, + "B2": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 48.64, + "z": 39.05 + }, + "A2": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 38.1, + "y": 67.92, + "z": 39.05 + }, + "D3": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 10.08, + "z": 39.05 + }, + "C3": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 29.36, + "z": 39.05 + }, + "B3": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 48.64, + "z": 39.05 + }, + "A3": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 57.99, + "y": 67.92, + "z": 39.05 + }, + "D4": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 10.08, + "z": 39.05 + }, + "C4": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 29.36, + "z": 39.05 + }, + "B4": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 48.64, + "z": 39.05 + }, + "A4": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 77.88, + "y": 67.92, + "z": 39.05 + }, + "D5": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 10.08, + "z": 39.05 + }, + "C5": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 29.36, + "z": 39.05 + }, + "B5": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 48.64, + "z": 39.05 + }, + "A5": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 97.77, + "y": 67.92, + "z": 39.05 + }, + "D6": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 10.08, + "z": 39.05 + }, + "C6": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 29.36, + "z": 39.05 + }, + "B6": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 48.64, + "z": 39.05 + }, + "A6": { + "depth": 42, + "diameter": 8.5, + "shape": "circular", + "totalLiquidVolume": 2, + "x": 117.66, + "y": 67.92, + "z": 39.05 + } + }, + "brand": { + "brand": "Opentrons", + "brandId": [] + } +} diff --git a/shared-data/definitions2/Opentrons_6_tuberack_50_mL_falcon.json b/shared-data/definitions2/Opentrons_6_tuberack_50_mL_falcon.json new file mode 100644 index 000000000000..3980ba627add --- /dev/null +++ b/shared-data/definitions2/Opentrons_6_tuberack_50_mL_falcon.json @@ -0,0 +1,106 @@ +{ + "ordering": [ + [ + "A1", + "B1" + ], + [ + "A2", + "B2" + ], + [ + "A3", + "B3" + ] + ], + "otId": "14807fb0-e8f4-11e8-b93b-5f6727dde048", + "deprecated": false, + "metadata": { + "displayLengthUnits": "mm", + "displayVolumeUnits": "mL", + "displayCategory": "tuberack", + "displayName": "Opentrons-tuberack-50mL-falcon", + "tags": [ + "50", + "mL", + "falcon", + "tuberack", + "Opentrons" + ] + }, + "cornerOffsetFromSlot": { + "x": -6.76, + "y": -6.73, + "z": 0 + }, + "dimensions": { + "overallLength": 121, + "overallWidth": 78.75, + "overallHeight": 123.76 + }, + "parameters": { + "format": "irregular", + "isTiprack": false, + "loadName": "Opentrons_6_tuberack_50_mL_falcon" + }, + "wells": { + "B1": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 33, + "y": 21.88, + "z": 6.04 + }, + "A1": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 33, + "y": 56.88, + "z": 6.04 + }, + "B2": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 68, + "y": 21.88, + "z": 6.04 + }, + "A2": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 68, + "y": 56.88, + "z": 6.04 + }, + "B3": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 103, + "y": 21.88, + "z": 6.04 + }, + "A3": { + "depth": 113.85, + "diameter": 26.45, + "shape": "circular", + "totalLiquidVolume": 50, + "x": 103, + "y": 56.88, + "z": 6.04 + } + }, + "brand": { + "brand": "Opentrons", + "brandId": ["352070"] + } +} diff --git a/shared-data/definitions2/Opentrons_6x15_mL_4x50_mL_tuberack.json b/shared-data/definitions2/Opentrons_6x15_mL_4x50_mL_tuberack.json index fb233a93cdad..b767eb9a62d1 100644 --- a/shared-data/definitions2/Opentrons_6x15_mL_4x50_mL_tuberack.json +++ b/shared-data/definitions2/Opentrons_6x15_mL_4x50_mL_tuberack.json @@ -143,6 +143,7 @@ } }, "brand": { - "brand": "Opentrons" + "brand": "Opentrons", + "brandId": ["352096", "352070"] } } diff --git a/shared-data/labware-json-schema/labware-schema.json b/shared-data/labware-json-schema/labware-schema.json index 0a5e846334d6..af46664aeb82 100644 --- a/shared-data/labware-json-schema/labware-schema.json +++ b/shared-data/labware-json-schema/labware-schema.json @@ -75,7 +75,7 @@ "format": { "description": "Property to determine compatibility with multichannel pipette", "type": "string", - "enum": ["96Standard", "384Standard", "trough", "irregular"] + "enum": ["96Standard", "384Standard", "trough", "irregular", "trash"] }, "isTiprack": { "description": "Flag marking whether a labware is a tiprack or not",