From 45d2899e74c41a6eca07620d2acf5d87444a1cd1 Mon Sep 17 00:00:00 2001 From: CaseyBatten Date: Mon, 20 May 2024 16:33:02 -0400 Subject: [PATCH] single channel definition updates --- .../2/general/single_channel/p10/1_0.json | 28 ++++++++++++----- .../2/general/single_channel/p10/1_3.json | 28 ++++++++++++----- .../2/general/single_channel/p10/1_4.json | 28 ++++++++++++----- .../2/general/single_channel/p10/1_5.json | 28 ++++++++++++----- .../2/general/single_channel/p1000/1_0.json | 14 ++++----- .../2/general/single_channel/p1000/1_3.json | 14 ++++----- .../2/general/single_channel/p1000/1_4.json | 14 ++++----- .../2/general/single_channel/p1000/1_5.json | 14 ++++----- .../2/general/single_channel/p1000/2_0.json | 13 ++++---- .../2/general/single_channel/p1000/2_1.json | 13 ++++---- .../2/general/single_channel/p1000/2_2.json | 13 ++++---- .../2/general/single_channel/p1000/3_0.json | 16 +++++----- .../2/general/single_channel/p1000/3_3.json | 16 +++++----- .../2/general/single_channel/p1000/3_4.json | 16 +++++----- .../2/general/single_channel/p1000/3_5.json | 16 +++++----- .../2/general/single_channel/p1000/3_6.json | 16 +++++----- .../2/general/single_channel/p20/2_0.json | 30 ++++++++++++++----- .../2/general/single_channel/p20/2_1.json | 30 ++++++++++++++----- .../2/general/single_channel/p20/2_2.json | 30 ++++++++++++++----- .../2/general/single_channel/p300/1_0.json | 13 ++++---- .../2/general/single_channel/p300/1_3.json | 13 ++++---- .../2/general/single_channel/p300/1_4.json | 13 ++++---- .../2/general/single_channel/p300/1_5.json | 13 ++++---- .../2/general/single_channel/p300/2_0.json | 6 +++- .../2/general/single_channel/p300/2_1.json | 6 +++- .../2/general/single_channel/p50/1_0.json | 13 ++++---- .../2/general/single_channel/p50/1_3.json | 13 ++++---- .../2/general/single_channel/p50/1_4.json | 13 ++++---- .../2/general/single_channel/p50/1_5.json | 13 ++++---- .../2/general/single_channel/p50/3_0.json | 26 +++++++++++----- .../2/general/single_channel/p50/3_3.json | 26 +++++++++++----- .../2/general/single_channel/p50/3_4.json | 26 +++++++++++----- .../2/general/single_channel/p50/3_5.json | 26 +++++++++++----- .../2/general/single_channel/p50/3_6.json | 26 +++++++++++----- 34 files changed, 385 insertions(+), 238 deletions(-) diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json index 3471d7b9c8f..05bdae3387b 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json @@ -3,18 +3,30 @@ "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 30.0 - }, "presses": 3, "increment": 1.0, - "distanceByTipCount": { - "1": 10.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 30.0, + "distance": 10.0, + "current": 0.1, + "tipOverlaps": { + "default": 3.29, + "opentrons/opentrons_96_tiprack_10ul/1": 3.29, + "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29, + "opentrons/geb_96_tiprack_10ul/1": 6.2, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json index 5d9190cd85f..702dfb9eddc 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json @@ -3,18 +3,30 @@ "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 30.0 - }, "presses": 3, "increment": 1.0, - "distanceByTipCount": { - "1": 10.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 30.0, + "distance": 10.0, + "current": 0.1, + "tipOverlaps": { + "default": 3.29, + "opentrons/opentrons_96_tiprack_10ul/1": 3.29, + "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29, + "opentrons/geb_96_tiprack_10ul/1": 6.2, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json index 3d88e354b13..abd67aa79ea 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json @@ -3,18 +3,30 @@ "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 30.0 - }, "presses": 3, "increment": 1.0, - "distanceByTipCount": { - "1": 10.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 30.0, + "distance": 10.0, + "current": 0.1, + "tipOverlaps": { + "default": 3.29, + "opentrons/opentrons_96_tiprack_10ul/1": 3.29, + "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29, + "opentrons/geb_96_tiprack_10ul/1": 6.2, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json index 3d88e354b13..abd67aa79ea 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json @@ -3,18 +3,30 @@ "displayName": "P10 Single-Channel GEN1", "model": "p10", "displayCategory": "GEN1", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 30.0 - }, "presses": 3, "increment": 1.0, - "distanceByTipCount": { - "1": 10.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 30.0, + "distance": 10.0, + "current": 0.1, + "tipOverlaps": { + "default": 3.29, + "opentrons/opentrons_96_tiprack_10ul/1": 3.29, + "opentrons/opentrons_96_filtertiprack_10ul/1": 3.29, + "opentrons/geb_96_tiprack_10ul/1": 6.2, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 1.0 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json index 8b69bb352dc..defe73ac6f8 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json @@ -18,13 +18,13 @@ "speed": 30.0, "distance": 15.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 15.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.95, + "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95, + "opentrons/geb_96_tiprack_1000ul/1": 11.2, + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json index 50eab52e799..5fb16c1c162 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json @@ -18,13 +18,13 @@ "speed": 30.0, "distance": 15.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 15.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.95, + "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95, + "opentrons/geb_96_tiprack_1000ul/1": 11.2, + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json index 50eab52e799..5fb16c1c162 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json @@ -18,13 +18,13 @@ "speed": 30.0, "distance": 15.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 15.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.95, + "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95, + "opentrons/geb_96_tiprack_1000ul/1": 11.2, + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json index 3dba137be5c..184d55801f1 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json @@ -18,13 +18,13 @@ "speed": 30.0, "distance": 15.0, "current": 0.15, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 15.0, - "current": 0.15, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.95, + "opentrons/opentrons_96_tiprack_1000ul/1": 7.95, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 7.95, + "opentrons/geb_96_tiprack_1000ul/1": 11.2, + "opentrons/eppendorf_96_tiprack_1000ul_eptips/1": 0.0 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json index 741abc8c372..cb2eb33f8de 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json @@ -18,13 +18,12 @@ "speed": 10.0, "distance": 17.0, "current": 0.17, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 10.0, - "distance": 17.0, - "current": 0.17, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 9.7, + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json index a20eb827e16..9bd0a96b1ff 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json @@ -18,13 +18,12 @@ "speed": 10.0, "distance": 17.0, "current": 0.17, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 10.0, - "distance": 17.0, - "current": 0.17, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 9.7, + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json index a20eb827e16..9bd0a96b1ff 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json @@ -18,13 +18,12 @@ "speed": 10.0, "distance": 17.0, "current": 0.17, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 10.0, - "distance": 17.0, - "current": 0.17, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 9.7, + "opentrons/opentrons_96_tiprack_1000ul/1": 11.5, + "opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5, + "opentrons/geb_96_tiprack_1000ul/1": 9.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json index 162707e6d65..4a7ea8b72aa 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json @@ -18,13 +18,15 @@ "speed": 5.0, "distance": 13.0, "current": 0.15, - "tipOverlap": 10.5 - }, - "t50": { - "speed": 5.0, - "distance": 13.0, - "current": 0.15, - "tipOverlap": 10.05 + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json index 162707e6d65..4a7ea8b72aa 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json @@ -18,13 +18,15 @@ "speed": 5.0, "distance": 13.0, "current": 0.15, - "tipOverlap": 10.5 - }, - "t50": { - "speed": 5.0, - "distance": 13.0, - "current": 0.15, - "tipOverlap": 10.05 + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json index 2190ff6b2e1..117771b2f26 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json @@ -18,13 +18,15 @@ "speed": 10.0, "distance": 13.0, "current": 0.2, - "tipOverlap": 10.5 - }, - "t50": { - "speed": 10.0, - "distance": 13.0, - "current": 0.2, - "tipOverlap": 10.05 + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json index 2190ff6b2e1..117771b2f26 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_5.json @@ -18,13 +18,15 @@ "speed": 10.0, "distance": 13.0, "current": 0.2, - "tipOverlap": 10.5 - }, - "t50": { - "speed": 10.0, - "distance": 13.0, - "current": 0.2, - "tipOverlap": 10.05 + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_6.json b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_6.json index 2190ff6b2e1..117771b2f26 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p1000/3_6.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p1000/3_6.json @@ -18,13 +18,15 @@ "speed": 10.0, "distance": 13.0, "current": 0.2, - "tipOverlap": 10.5 - }, - "t50": { - "speed": 10.0, - "distance": 13.0, - "current": 0.2, - "tipOverlap": 10.05 + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json index 5b848afe0f5..c44392e18e1 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json @@ -3,18 +3,32 @@ "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 10.0 - }, "presses": 1, "increment": 0.0, - "distanceByTipCount": { - "1": 14.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 14.0, + "current": 0.1, + "tipOverlaps": { + "default": 8.25, + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3, + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json index 58f82399948..99ca05dc2f4 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json @@ -3,18 +3,32 @@ "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 10.0 - }, "presses": 1, "increment": 0.0, - "distanceByTipCount": { - "1": 14.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 14.0, + "current": 0.1, + "tipOverlaps": { + "default": 8.25, + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3, + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json index 58f82399948..99ca05dc2f4 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json @@ -3,18 +3,32 @@ "displayName": "P20 Single-Channel GEN2", "model": "p20", "displayCategory": "GEN2", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { - "speedByTipCount": { - "1": 10.0 - }, "presses": 1, "increment": 0.0, - "distanceByTipCount": { - "1": 14.0 - }, - "currentByTipCount": { - "1": 0.1 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 14.0, + "current": 0.1, + "tipOverlaps": { + "default": 8.25, + "opentrons/opentrons_96_tiprack_10ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_10ul/1": 8.25, + "opentrons/eppendorf_96_tiprack_10ul_eptips/1": 8.4, + "opentrons/geb_96_tiprack_10ul/1": 8.3, + "opentrons/opentrons_96_tiprack_20ul/1": 8.25, + "opentrons/opentrons_96_filtertiprack_20ul/1": 8.25 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json index 604bc8d3df9..03cb867e1c8 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json index a98c6ecb851..86dcb14204f 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json index cdedd2bd777..a0017dc3849 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json index cdedd2bd777..a0017dc3849 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/1_5.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json index 45af54451bb..de4c9b00b9c 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_0.json @@ -18,7 +18,11 @@ "speed": 10.0, "distance": 17.0, "current": 0.125, - "tipOverlap": 8.2 + "tipOverlaps": { + "default": 8.2, + "opentrons/opentrons_96_tiprack_300ul/1": 8.2, + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json index 09c79e49caf..018e9011697 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p300/2_1.json @@ -18,7 +18,11 @@ "speed": 10.0, "distance": 17.0, "current": 0.125, - "tipOverlap": 8.2 + "tipOverlaps": { + "default": 8.2, + "opentrons/opentrons_96_tiprack_300ul/1": 8.2, + "opentrons/opentrons_96_filtertiprack_200ul/1": 8.2 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json index 6b7c11cffe7..ef287ebfd95 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_0.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json index 3893bb2e700..ca26ec4f82d 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_3.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json index 03f1352525f..c5179fbecd2 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_4.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json index 03f1352525f..c5179fbecd2 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/1_5.json @@ -18,13 +18,12 @@ "speed": 30.0, "distance": 10.0, "current": 0.1, - "tipOverlap": 7.47 - }, - "t200": { - "speed": 30.0, - "distance": 10.0, - "current": 0.1, - "tipOverlap": 6.1 + "tipOverlaps": { + "default": 7.47, + "opentrons/opentrons_96_tiprack_300ul/1": 7.47, + "opentrons/tipone_96_tiprack_200ul/1": 6.1, + "opentrons/opentrons_96_filtertiprack_200ul/1": 7.47 + } } } } diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json index 1c9d02e7e0f..da5b05606f5 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_0.json @@ -3,18 +3,28 @@ "displayName": "Flex 1-Channel 50 μL", "model": "p50", "displayCategory": "FLEX", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { "presses": 1, - "speedByTipCount": { - "1": 5.0 - }, "increment": 0.0, - "distanceByTipCount": { - "1": 13.0 - }, - "currentByTipCount": { - "1": 0.15 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 5.0, + "distance": 13.0, + "current": 0.15, + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json index 1641adea42d..da5b05606f5 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_3.json @@ -3,18 +3,28 @@ "displayName": "Flex 1-Channel 50 μL", "model": "p50", "displayCategory": "FLEX", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { "presses": 1, - "speedByTipCount": { - "1": 5 - }, "increment": 0.0, - "distanceByTipCount": { - "1": 13.0 - }, - "currentByTipCount": { - "1": 0.15 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 5.0, + "distance": 13.0, + "current": 0.15, + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json index 1f29cbf71f1..6ad15d9c7ee 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_4.json @@ -3,18 +3,28 @@ "displayName": "Flex 1-Channel 50 μL", "model": "p50", "displayCategory": "FLEX", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { "presses": 1, - "speedByTipCount": { - "1": 10.0 - }, "increment": 0.0, - "distanceByTipCount": { - "1": 13.0 - }, - "currentByTipCount": { - "1": 0.2 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 13.0, + "current": 0.2, + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json index 1f29cbf71f1..6ad15d9c7ee 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_5.json @@ -3,18 +3,28 @@ "displayName": "Flex 1-Channel 50 μL", "model": "p50", "displayCategory": "FLEX", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { "presses": 1, - "speedByTipCount": { - "1": 10.0 - }, "increment": 0.0, - "distanceByTipCount": { - "1": 13.0 - }, - "currentByTipCount": { - "1": 0.2 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 13.0, + "current": 0.2, + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } + } + } } } }, diff --git a/shared-data/pipette/definitions/2/general/single_channel/p50/3_6.json b/shared-data/pipette/definitions/2/general/single_channel/p50/3_6.json index 1f29cbf71f1..6ad15d9c7ee 100644 --- a/shared-data/pipette/definitions/2/general/single_channel/p50/3_6.json +++ b/shared-data/pipette/definitions/2/general/single_channel/p50/3_6.json @@ -3,18 +3,28 @@ "displayName": "Flex 1-Channel 50 μL", "model": "p50", "displayCategory": "FLEX", + "validNozzleMaps": { + "maps": { + "A1": ["A1"] + } + }, "pickUpTipConfigurations": { "pressFit": { "presses": 1, - "speedByTipCount": { - "1": 10.0 - }, "increment": 0.0, - "distanceByTipCount": { - "1": 13.0 - }, - "currentByTipCount": { - "1": 0.2 + "configurationsByNozzleMap": { + "A1": { + "default": { + "speed": 10.0, + "distance": 13.0, + "current": 0.2, + "tipOverlaps": { + "default": 10.5, + "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5, + "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5 + } + } + } } } },