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(shared-data): Add more new labware definitions to shared-data #2703

Merged
merged 13 commits into from
Dec 10, 2018
Merged

feat(shared-data): Add more new labware definitions to shared-data #2703

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
52189fa
feat(Add more new labware definitions to shared-datadefinitions): Add…
Laura-Danielle Nov 20, 2018
622a7b1
Made requested changes
Laura-Danielle Nov 23, 2018
8fa98cd
Made requested changes
Laura-Danielle Nov 28, 2018
bd4e6bc
Add more defs
Laura-Danielle Dec 1, 2018
5d72316
Add cornerOffset test
Laura-Danielle Dec 1, 2018
5113f6b
Fix linter errors
Laura-Danielle Dec 3, 2018
accb263
Add GEB tipracks
Laura-Danielle Dec 5, 2018
98f6442
Fix trough def
Laura-Danielle Dec 5, 2018
6358993
Fix 2ml tuberack definitions
Laura-Danielle Dec 7, 2018
cd55d44
Curly boi attack
Laura-Danielle Dec 7, 2018
763e21c
fix screwcap def and change def names to lowercase
Laura-Danielle Dec 10, 2018
a52e23c
change filenames to lowercase
Laura-Danielle Dec 10, 2018
1affe1e
Fix tests
Laura-Danielle Dec 10, 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
7 changes: 6 additions & 1 deletion labware-designer/README.md
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion shared-data/definitions/opentrons-tuberack-50ml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
"z": 7.78
}
}
}
}
201 changes: 201 additions & 0 deletions shared-data/definitions2/Opentrons_15_tuberack_15_mL_falcon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
{
"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 15 mL tuberack",
"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",
"isMagneticModuleCompatible": false
},
"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"]
}
}
51 changes: 51 additions & 0 deletions shared-data/definitions2/Opentrons_1_trash_0.85_L.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"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": 0,
"y": 0,
"z": 0
},
"dimensions": {
"overallLength": 172.86,
"overallWidth": 165.86,
"overallHeight": 58
},
"parameters": {
"format": "trash",
"isTiprack": false,
"loadName": "Opentrons_1_trash_0.85_L",
"isMagneticModuleCompatible": false
},
"wells": {
"A1": {
"shape": "rectangular",
"length": 165.67,
"width": 107.11,
"totalLiquidVolume": 0.85,
"depth": 53,
"x": 82.84,
"y": 53.56,
"z": 5
}
},
"brand": {
"brand": "Opentrons"
}
}
51 changes: 51 additions & 0 deletions shared-data/definitions2/Opentrons_1_trash_1.1_L.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"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": 0,
"y": 0,
"z": 0
},
"dimensions": {
"overallLength": 172.86,
"overallWidth": 165.86,
"overallHeight": 82
},
"parameters": {
"format": "trash",
"isTiprack": false,
"loadName": "Opentrons_1_trash_1.1_L",
"isMagneticModuleCompatible": false
},
"wells": {
"A1": {
"shape": "rectangular",
"length": 165.67,
"width": 107.11,
"totalLiquidVolume": 1.1,
"depth": 77,
"x": 82.84,
"y": 53.56,
"z": 5
}
},
"brand": {
"brand": "Opentrons"
}
}
Loading