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

…2703)
Opentrons · Dec 10, 2018 · 9737196 · 9737196
1 parent 2052f49
commit 9737196
Show file tree

Hide file tree

Showing 31 changed files with 13,028 additions and 308 deletions.
diff --git a/api/tests/opentrons/protocol_api/test_context.py b/api/tests/opentrons/protocol_api/test_context.py
@@ -115,7 +115,7 @@ def test_pipette_info(loop):
 def test_pick_up_and_drop_tip(loop, load_my_labware):
     ctx = papi.ProtocolContext(loop)
     ctx.home()
-    tiprack = ctx.load_labware_by_name('Opentrons_96_tiprack_300_uL', 1)
+    tiprack = ctx.load_labware_by_name('opentrons_96_tiprack_300_uL', 1)
     tip_lenth = tiprack.tip_length
     mount = Mount.LEFT
 
@@ -139,10 +139,10 @@ def test_pick_up_tip_no_location(loop, load_my_labware):
     ctx = papi.ProtocolContext(loop)
     ctx.home()
 
-    tiprack1 = ctx.load_labware_by_name('Opentrons_96_tiprack_300_uL', 1)
+    tiprack1 = ctx.load_labware_by_name('opentrons_96_tiprack_300_uL', 1)
     tip_lenth1 = tiprack1.tip_length
 
-    tiprack2 = ctx.load_labware_by_name('Opentrons_96_tiprack_300_uL', 2)
+    tiprack2 = ctx.load_labware_by_name('opentrons_96_tiprack_300_uL', 2)
     tip_length2 = tip_lenth1 + 1.0
     tiprack2.tip_length = tip_length2
 

diff --git a/api/tests/opentrons/protocol_api/test_labware.py b/api/tests/opentrons/protocol_api/test_labware.py
@@ -195,7 +195,7 @@ def test_well_parent():
 
 
 def test_tip_tracking_init():
-    labware_name = 'Opentrons_96_tiprack_300_uL'
+    labware_name = 'opentrons_96_tiprack_300_uL'
     labware_def = labware._load_definition_by_name(labware_name)
     tiprack = labware.Labware(labware_def,
                               Location(Point(0, 0, 0), 'Test Slot'))
@@ -215,7 +215,7 @@ def test_tip_tracking_init():
 
 
 def test_use_tips():
-    labware_name = 'Opentrons_96_tiprack_300_uL'
+    labware_name = 'opentrons_96_tiprack_300_uL'
     labware_def = labware._load_definition_by_name(labware_name)
     tiprack = labware.Labware(labware_def,
                               Location(Point(0, 0, 0), 'Test Slot'))
@@ -254,7 +254,7 @@ def test_use_tips():
 
 
 def test_select_next_tip():
-    labware_name = 'Opentrons_96_tiprack_300_uL'
+    labware_name = 'opentrons_96_tiprack_300_uL'
     labware_def = labware._load_definition_by_name(labware_name)
     tiprack = labware.Labware(labware_def,
                               Location(Point(0, 0, 0), 'Test Slot'))

diff --git 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/shared-data/definitions/opentrons-tuberack-50ml.json b/shared-data/definitions/opentrons-tuberack-50ml.json
@@ -86,4 +86,4 @@
       "z": 7.78
     }
   }
-}
+}
diff --git a/shared-data/definitions2/Opentrons_24_tuberack_1.5_mL_Eppendorf.json b/shared-data/definitions2/Opentrons_24_tuberack_1.5_mL_Eppendorf.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,4 +86,4 @@ @@
           "z": 7.78
         }
       }
-    }
+    }