Skip to content

Commit

Permalink
feat(Add more new labware definitions to shared-datadefinitions): Add…
Browse files Browse the repository at this point in the history
… more new labware definitions t
  • Loading branch information
Laura-Danielle committed Nov 20, 2018
1 parent 132b3e9 commit 1b2059d
Show file tree
Hide file tree
Showing 16 changed files with 1,015 additions and 18 deletions.
7 changes: 6 additions & 1 deletion labware-designer/README.md
Original file line number Diff line number Diff line change
@@ -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?
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"name": "opentrons-tuberack-1.5ml-eppendorf",
"name": "Opentrons_24_tuberack_1.5_mL_Eppendorf",
"format": "irregular",
"displayCategory": "tube-rack"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"name": "opentrons-tuberack-2ml-eppendorf",
"name": "Opentrons_24_tuberack_2_mL-Eppendorf",
"format": "irregular",
"displayCategory": "tube-rack"
},
Expand Down Expand Up @@ -308,4 +308,4 @@
"z": 43.3
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"name": "opentrons-tuberack-2ml-screwcap",
"name": "Opentrons_24_tuberack_2_mL_screwcap",
"format": "irregular",
"displayCategory": "tube-rack"
},
Expand Down Expand Up @@ -308,4 +308,4 @@
"z": 45.2
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"name": "opentrons-tuberack-50ml",
"name": "Opentrons_6_tuberack_50_mL_falcon",
"format": "irregular",
"displayCategory": "tube-rack"
},
Expand Down Expand Up @@ -86,4 +86,4 @@
"z": 7.78
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"name": "opentrons-tuberack-15_50ml",
"name": "Opentrons_6x15_mL_4x50_mL_tuberack",
"format": "irregular",
"displayCategory": "tube-rack"
},
Expand Down Expand Up @@ -136,4 +136,4 @@
"z": 10.78
}
}
}
}
200 changes: 200 additions & 0 deletions shared-data/definitions2/Opentrons_15_tuberack_15_mL_falcon.json
Original file line number Diff line number Diff line change
@@ -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"]
}
}
50 changes: 50 additions & 0 deletions shared-data/definitions2/Opentrons_1_trash_0.85_L.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading

0 comments on commit 1b2059d

Please sign in to comment.