From decafdaf00631e071ab1474952d9064740d82c93 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Mon, 9 Oct 2023 07:23:19 +0300 Subject: [PATCH] update per tip currents and remove pick up current config --- .../instruments/nozzle_manager.py | 12 ++------- .../instruments/ot2/pipette.py | 2 -- .../instruments/ot3/pipette.py | 4 --- .../instruments/test_nozzle_manager.py | 5 +--- .../2/general/eight_channel/p10/1_0.json | 17 ++++++------ .../2/general/eight_channel/p10/1_3.json | 17 ++++++------ .../2/general/eight_channel/p10/1_4.json | 17 ++++++------ .../2/general/eight_channel/p10/1_5.json | 17 ++++++------ .../2/general/eight_channel/p10/1_6.json | 17 ++++++------ .../2/general/eight_channel/p1000/1_0.json | 17 ++++++------ .../2/general/eight_channel/p1000/3_0.json | 17 ++++++------ .../2/general/eight_channel/p1000/3_3.json | 17 ++++++------ .../2/general/eight_channel/p1000/3_4.json | 15 +++++------ .../2/general/eight_channel/p1000/3_5.json | 15 +++++------ .../2/general/eight_channel/p20/2_0.json | 17 ++++++------ .../2/general/eight_channel/p20/2_1.json | 17 ++++++------ .../2/general/eight_channel/p300/1_0.json | 17 ++++++------ .../2/general/eight_channel/p300/1_3.json | 17 ++++++------ .../2/general/eight_channel/p300/1_4.json | 17 ++++++------ .../2/general/eight_channel/p300/1_5.json | 15 +++++------ .../2/general/eight_channel/p300/2_0.json | 17 ++++++------ .../2/general/eight_channel/p300/2_1.json | 17 ++++++------ .../2/general/eight_channel/p50/1_0.json | 17 ++++++------ .../2/general/eight_channel/p50/1_3.json | 17 ++++++------ .../2/general/eight_channel/p50/1_4.json | 17 ++++++------ .../2/general/eight_channel/p50/1_5.json | 17 ++++++------ .../2/general/eight_channel/p50/3_0.json | 17 ++++++------ .../2/general/eight_channel/p50/3_3.json | 17 ++++++------ .../2/general/eight_channel/p50/3_4.json | 17 ++++++------ .../2/general/eight_channel/p50/3_5.json | 17 ++++++------ .../general/ninety_six_channel/p1000/1_0.json | 26 +++++++++---------- .../general/ninety_six_channel/p1000/3_0.json | 26 +++++++++---------- .../general/ninety_six_channel/p1000/3_3.json | 26 +++++++++---------- .../general/ninety_six_channel/p1000/3_4.json | 26 +++++++++---------- .../general/ninety_six_channel/p1000/3_5.json | 26 +++++++++---------- .../2/general/single_channel/p10/1_0.json | 6 +++-- .../2/general/single_channel/p10/1_3.json | 6 +++-- .../2/general/single_channel/p10/1_4.json | 6 +++-- .../2/general/single_channel/p10/1_5.json | 6 +++-- .../2/general/single_channel/p1000/1_0.json | 6 +++-- .../2/general/single_channel/p1000/1_3.json | 6 +++-- .../2/general/single_channel/p1000/1_4.json | 6 +++-- .../2/general/single_channel/p1000/1_5.json | 6 +++-- .../2/general/single_channel/p1000/2_0.json | 6 +++-- .../2/general/single_channel/p1000/2_1.json | 6 +++-- .../2/general/single_channel/p1000/2_2.json | 6 +++-- .../2/general/single_channel/p1000/3_0.json | 6 +++-- .../2/general/single_channel/p1000/3_3.json | 6 +++-- .../2/general/single_channel/p1000/3_4.json | 6 +++-- .../2/general/single_channel/p1000/3_5.json | 6 +++-- .../2/general/single_channel/p20/2_0.json | 6 +++-- .../2/general/single_channel/p20/2_1.json | 6 +++-- .../2/general/single_channel/p20/2_2.json | 6 +++-- .../2/general/single_channel/p300/1_0.json | 6 +++-- .../2/general/single_channel/p300/1_3.json | 6 +++-- .../2/general/single_channel/p300/1_4.json | 6 +++-- .../2/general/single_channel/p300/1_5.json | 6 +++-- .../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 | 6 +++-- .../2/general/single_channel/p50/1_3.json | 6 +++-- .../2/general/single_channel/p50/1_4.json | 6 +++-- .../2/general/single_channel/p50/1_5.json | 8 +++--- .../2/general/single_channel/p50/3_0.json | 6 +++-- .../2/general/single_channel/p50/3_3.json | 6 +++-- .../2/general/single_channel/p50/3_4.json | 6 +++-- .../2/general/single_channel/p50/3_5.json | 6 +++-- .../pipette/pipette_definition.py | 4 +-- 68 files changed, 403 insertions(+), 384 deletions(-) diff --git a/api/src/opentrons/hardware_control/instruments/nozzle_manager.py b/api/src/opentrons/hardware_control/instruments/nozzle_manager.py index fcb534da09a..6b142cb339a 100644 --- a/api/src/opentrons/hardware_control/instruments/nozzle_manager.py +++ b/api/src/opentrons/hardware_control/instruments/nozzle_manager.py @@ -210,8 +210,7 @@ def __init__( def build_from_nozzlemap( cls, nozzle_map: Dict[str, List[float]], - default_pickup_current: float, - pick_up_current_map: Optional[Dict[int, float]] = None, + pick_up_current_map: Dict[int, float], ) -> "NozzleConfigurationManager": sorted_nozzlemap = list(nozzle_map.keys()) @@ -227,14 +226,7 @@ def build_from_nozzlemap( back_left_nozzle=first_nozzle, front_right_nozzle=last_nozzle, ) - if pick_up_current_map: - current_map = pick_up_current_map - else: - current_map = { - num_tips + 1: default_pickup_current - for num_tips in range(len(starting_nozzle_config.map_store)) - } - return cls(starting_nozzle_config, current_map) + return cls(starting_nozzle_config, pick_up_current_map) @property def starting_nozzle_offset(self) -> Point: diff --git a/api/src/opentrons/hardware_control/instruments/ot2/pipette.py b/api/src/opentrons/hardware_control/instruments/ot2/pipette.py index 5a39ce57c1d..fe888ea35b4 100644 --- a/api/src/opentrons/hardware_control/instruments/ot2/pipette.py +++ b/api/src/opentrons/hardware_control/instruments/ot2/pipette.py @@ -111,7 +111,6 @@ def __init__( self._nozzle_manager = ( nozzle_manager.NozzleConfigurationManager.build_from_nozzlemap( self._config.nozzle_map, - self._pick_up_configurations.current, self._config.partial_tip_configurations.per_tip_pickup_current, ) ) @@ -295,7 +294,6 @@ def reset_state(self) -> None: self._nozzle_manager = ( nozzle_manager.NozzleConfigurationManager.build_from_nozzlemap( self._config.nozzle_map, - self._pick_up_configurations.current, self._config.partial_tip_configurations.per_tip_pickup_current, ) ) diff --git a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py index eb4a0ec111a..a1192b36977 100644 --- a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py +++ b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py @@ -97,7 +97,6 @@ def __init__( self._nozzle_manager = ( nozzle_manager.NozzleConfigurationManager.build_from_nozzlemap( self._config.nozzle_map, - self._pick_up_configurations.current, self._config.partial_tip_configurations.per_tip_pickup_current, ) ) @@ -261,7 +260,6 @@ def reset_state(self) -> None: self._nozzle_manager = ( nozzle_manager.NozzleConfigurationManager.build_from_nozzlemap( self._config.nozzle_map, - self._pick_up_configurations.current, self._config.partial_tip_configurations.per_tip_pickup_current, ) ) @@ -321,8 +319,6 @@ def critical_point(self, cp_override: Optional[CriticalPoint] = None) -> Point: cp_with_tip_length = self._nozzle_manager.critical_point_with_tip_length( cp_override, self.current_tip_length if cp_override != CriticalPoint.NOZZLE else 0.0, - cp_override, self.current_tip_length - ) cp = cp_with_tip_length + instr diff --git a/api/tests/opentrons/hardware_control/instruments/test_nozzle_manager.py b/api/tests/opentrons/hardware_control/instruments/test_nozzle_manager.py index 2eafaafebf7..b2b97856640 100644 --- a/api/tests/opentrons/hardware_control/instruments/test_nozzle_manager.py +++ b/api/tests/opentrons/hardware_control/instruments/test_nozzle_manager.py @@ -7,15 +7,12 @@ from opentrons.types import Point from opentrons.hardware_control.types import CriticalPoint -from opentrons.types import Point -from opentrons.hardware_control.types import CriticalPoint - def build_nozzle_manger( nozzle_map: Dict[str, List[float]] ) -> nozzle_manager.NozzleConfigurationManager: return nozzle_manager.NozzleConfigurationManager.build_from_nozzlemap( - nozzle_map, default_pickup_current=1 + nozzle_map, pick_up_current_map={1: 0.1} ) diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json index 2ea3705c533..841fad486b7 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.4, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.1, + "3": 0.15, + "4": 0.2, + "5": 0.25, + "6": 0.3, + "7": 0.35, + "8": 0.4 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json index aa145d78a3c..52dcb1d594c 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.4, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.1, + "3": 0.15, + "4": 0.2, + "5": 0.25, + "6": 0.3, + "7": 0.35, + "8": 0.4 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json index 43ca2ffe77b..a66b26a1b03 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.4, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.1, + "3": 0.15, + "4": 0.2, + "5": 0.25, + "6": 0.3, + "7": 0.35, + "8": 0.4 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json index 609a1ed1409..c0afb132bcf 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.55, "speed": 30.0, "presses": 3, "increment": 3.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.14, + "3": 0.21, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json index 609a1ed1409..c0afb132bcf 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.55, "speed": 30.0, "presses": 3, "increment": 3.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.14, + "3": 0.21, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json index dcda35b2d5f..6636bc0a670 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.5, "presses": 1, "speed": 10, "increment": 0.0, @@ -42,14 +41,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.15, + "2": 0.13, + "3": 0.19, + "4": 0.25, + "5": 0.31, + "6": 0.38, + "7": 0.44, + "8": 0.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json index 973ec3cc63f..1bc84ff4ac9 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.5, "presses": 1, "speed": 10, "increment": 0.0, @@ -42,14 +41,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.15, + "2": 0.13, + "3": 0.19, + "4": 0.25, + "5": 0.31, + "6": 0.38, + "7": 0.44, + "8": 0.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json index 973ec3cc63f..1bc84ff4ac9 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.5, "presses": 1, "speed": 10, "increment": 0.0, @@ -42,14 +41,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.15, + "2": 0.13, + "3": 0.19, + "4": 0.25, + "5": 0.31, + "6": 0.38, + "7": 0.44, + "8": 0.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json index ec210d87004..cfc6ec19250 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.55, "presses": 1, "speed": 10, "increment": 0.0, @@ -43,13 +42,13 @@ "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "2": 0.14, + "3": 0.21, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json index ec210d87004..cfc6ec19250 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p1000/3_5.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.55, "presses": 1, "speed": 10, "increment": 0.0, @@ -43,13 +42,13 @@ "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "2": 0.14, + "3": 0.21, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json index d581407c308..5bbe6687b47 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json @@ -4,7 +4,6 @@ "model": "p20", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.6, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.28, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json index d581407c308..5bbe6687b47 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json @@ -4,7 +4,6 @@ "model": "p20", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.6, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.28, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json index a6c8c738cba..a4fc47d004e 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json index 007fe76b796..9f76fca6456 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json index 007fe76b796..9f76fca6456 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json index f9423e2d223..a1e9fb3e327 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.9, "speed": 30.0, "presses": 3, "increment": 3.0, @@ -36,13 +35,13 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, + "1": 0.1, + "2": 0.23, + "3": 0.34, + "4": 0.45, + "5": 0.56, + "6": 0.68, + "7": 0.79, "8": 0.9 } }, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json index 0813f6f363b..e28d4e6e9ad 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.8, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.13, + "2": 0.2, + "3": 0.3, + "4": 0.4, + "5": 0.5, + "6": 0.6, + "7": 0.7, + "8": 0.8 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json index 0813f6f363b..e28d4e6e9ad 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.8, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.13, + "2": 0.2, + "3": 0.3, + "4": 0.4, + "5": 0.5, + "6": 0.6, + "7": 0.7, + "8": 0.8 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json index 7923b780c3e..671431e59dd 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json index effafcc36fe..1f421a6fc74 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json index 8a7a7aeba3a..33bad67b01d 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.6, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.15, + "3": 0.23, + "4": 0.3, + "5": 0.38, + "6": 0.45, + "7": 0.53, + "8": 0.6 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json index eadead8b061..88b0c72bd49 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.8, "speed": 30.0, "presses": 3, "increment": 3.0, @@ -36,14 +35,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.1, + "2": 0.2, + "3": 0.3, + "4": 0.4, + "5": 0.5, + "6": 0.6, + "7": 0.7, + "8": 0.8 } }, "channels": 8, diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json index 196f28d599f..cc541b473b8 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.5, "presses": 1, "speed": 10, "increment": 0.0, @@ -48,14 +47,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.15, + "2": 0.13, + "3": 0.19, + "4": 0.25, + "5": 0.31, + "6": 0.38, + "7": 0.44, + "8": 0.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json index 196f28d599f..cc541b473b8 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.5, "presses": 1, "speed": 10, "increment": 0.0, @@ -48,14 +47,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.15, + "2": 0.13, + "3": 0.19, + "4": 0.25, + "5": 0.31, + "6": 0.38, + "7": 0.44, + "8": 0.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json index f692026cd8a..a32d2b2d127 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.55, "presses": 1, "speed": 10, "increment": 0.0, @@ -48,14 +47,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.20, + "2": 0.14, + "3": 0.20, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json index f692026cd8a..a32d2b2d127 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json +++ b/shared-data/pipette/definitions/2/general/eight_channel/p50/3_5.json @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.55, "presses": 1, "speed": 10, "increment": 0.0, @@ -48,14 +47,14 @@ "partialTipSupported": true, "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.3, - "3": 0.4, - "4": 0.5, - "5": 0.6, - "6": 0.7, - "7": 0.8, - "8": 0.9 + "1": 0.20, + "2": 0.14, + "3": 0.20, + "4": 0.28, + "5": 0.34, + "6": 0.41, + "7": 0.48, + "8": 0.55 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json index 36d02b774e1..8324eac7263 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 1.5, "presses": 0.0, "speed": 5.5, "increment": 0.0, @@ -43,18 +42,19 @@ "partialTipSupported": true, "availableConfigurations": [1, 8, 12, 96], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.2, - "3": 0.2, - "4": 0.3, - "5": 0.4, - "6": 0.5, - "7": 0.5, - "8": 0.5, - "12": 0.5, - "16": 1.0, - "24": 1.5, - "48": 1.5 + "1": 0.02, + "2": 0.03, + "3": 0.05, + "4": 0.06, + "5": 0.08, + "6": 0.09, + "7": 0.11, + "8": 0.13, + "12": 0.19, + "16": 0.25, + "24": 0.38, + "48": 0.75, + "96": 1.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json index 79280a62c55..586f91a7915 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 1.5, "presses": 0.0, "speed": 5.5, "increment": 0.0, @@ -43,18 +42,19 @@ "partialTipSupported": true, "availableConfigurations": [1, 8, 12, 96], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.2, - "3": 0.2, - "4": 0.3, - "5": 0.4, - "6": 0.5, - "7": 0.5, - "8": 0.5, - "12": 0.5, - "16": 1.0, - "24": 1.5, - "48": 1.5 + "1": 0.02, + "2": 0.03, + "3": 0.05, + "4": 0.06, + "5": 0.08, + "6": 0.09, + "7": 0.11, + "8": 0.13, + "12": 0.19, + "16": 0.25, + "24": 0.38, + "48": 0.75, + "96": 1.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json index 79280a62c55..586f91a7915 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 1.5, "presses": 0.0, "speed": 5.5, "increment": 0.0, @@ -43,18 +42,19 @@ "partialTipSupported": true, "availableConfigurations": [1, 8, 12, 96], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.2, - "3": 0.2, - "4": 0.3, - "5": 0.4, - "6": 0.5, - "7": 0.5, - "8": 0.5, - "12": 0.5, - "16": 1.0, - "24": 1.5, - "48": 1.5 + "1": 0.02, + "2": 0.03, + "3": 0.05, + "4": 0.06, + "5": 0.08, + "6": 0.09, + "7": 0.11, + "8": 0.13, + "12": 0.19, + "16": 0.25, + "24": 0.38, + "48": 0.75, + "96": 1.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json index 39b3accccf9..c7257738b14 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 1.5, "presses": 0.0, "speed": 5.5, "increment": 0.0, @@ -43,18 +42,19 @@ "partialTipSupported": true, "availableConfigurations": [1, 8, 12, 96], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.2, - "3": 0.2, - "4": 0.3, - "5": 0.4, - "6": 0.5, - "7": 0.5, - "8": 0.5, - "12": 0.5, - "16": 1.0, - "24": 1.5, - "48": 1.5 + "1": 0.02, + "2": 0.03, + "3": 0.05, + "4": 0.06, + "5": 0.08, + "6": 0.09, + "7": 0.11, + "8": 0.13, + "12": 0.19, + "16": 0.25, + "24": 0.38, + "48": 0.75, + "96": 1.5 } }, "backCompatNames": [], diff --git a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json index e3a317b1646..9c5cf5e9f5f 100644 --- a/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json +++ b/shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_5.json @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 1.5, "presses": 0.0, "speed": 5.5, "increment": 0.0, @@ -43,18 +42,19 @@ "partialTipSupported": true, "availableConfigurations": [1, 8, 12, 16, 24, 48, 96], "perTipPickupCurrent": { - "1": 0.2, - "2": 0.2, - "3": 0.2, - "4": 0.3, - "5": 0.4, - "6": 0.5, - "7": 0.5, - "8": 0.5, - "12": 0.5, - "16": 1.0, - "24": 1.5, - "48": 1.5 + "1": 0.02, + "2": 0.03, + "3": 0.05, + "4": 0.06, + "5": 0.08, + "6": 0.09, + "7": 0.11, + "8": 0.13, + "12": 0.19, + "16": 0.25, + "24": 0.38, + "48": 0.75, + "96": 1.5 } }, "backCompatNames": [], 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 8cc699533ec..9125997370a 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 @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 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 1e6765e00b4..0f3f1c6f52f 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 @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 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 a044395382c..2367214103c 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 @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 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 a044395382c..2367214103c 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 @@ -4,7 +4,6 @@ "model": "p10", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 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 c5e73bc3e7e..9f0481c163e 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 9.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 38a62cda856..204c5f79ee2 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 9.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 38a62cda856..204c5f79ee2 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 9.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 a2fc3c6edc2..155a692e7ab 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.15, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.15 + } }, "channels": 1, "shaftDiameter": 9.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 3c1777feffe..49f6ed48a2b 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.17, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.17 + } }, "channels": 1, "shaftDiameter": 6.0, 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 7609ef93972..0905fddc243 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.17, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.17 + } }, "channels": 1, "shaftDiameter": 6.0, 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 7609ef93972..0905fddc243 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.17, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.17 + } }, "channels": 1, "shaftDiameter": 6.0, 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 972a8516216..eb7f7ffb4f4 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.15, "presses": 1, "speed": 5, "increment": 0.0, @@ -39,7 +38,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.15 + } }, "backCompatNames": [], "channels": 1, 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 972a8516216..eb7f7ffb4f4 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.15, "presses": 1, "speed": 5, "increment": 0.0, @@ -39,7 +38,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.15 + } }, "backCompatNames": [], "channels": 1, 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 98c7d9707e0..7a39720e26f 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.2, "presses": 1, "speed": 10, "increment": 0.0, @@ -39,7 +38,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.2 + } }, "backCompatNames": [], "channels": 1, 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 98c7d9707e0..7a39720e26f 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 @@ -4,7 +4,6 @@ "model": "p1000", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.2, "presses": 1, "speed": 10, "increment": 0.0, @@ -39,7 +38,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.2 + } }, "backCompatNames": [], "channels": 1, 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 7d8dc7fa606..d8b29fffc10 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 @@ -4,7 +4,6 @@ "model": "p20", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.1, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 1.0, 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 a7a3649cdea..e169dffa2d5 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 @@ -4,7 +4,6 @@ "model": "p20", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.1, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 1.0, 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 a7a3649cdea..e169dffa2d5 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 @@ -4,7 +4,6 @@ "model": "p20", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.1, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 1.0, 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 4f174a5eb8c..42002c7e177 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 5.0, 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 8e7663ad458..1b283387165 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 5.0, 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 5bc84742f62..a14d368c703 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 5.0, 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 5bc84742f62..a14d368c703 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 5.0, 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 5a9dae759b4..54fb5335317 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.125, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.125 + } }, "channels": 1, "shaftDiameter": 3.5, 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 3686e581240..94b2212053a 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 @@ -4,7 +4,6 @@ "model": "p300", "displayCategory": "GEN2", "pickUpTipConfigurations": { - "current": 0.125, "speed": 10.0, "presses": 1, "increment": 0.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.125 + } }, "channels": 1, "shaftDiameter": 3.5, 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 a23409dfdf9..96753c43a21 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 2.0, 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 34329f19cbd..010e4d3a55c 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 2.0, 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 a6e1872d352..4349c86a6c6 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "GEN1", "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -34,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 2.0, 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 7a4f2053d1d..4349c86a6c6 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 @@ -3,10 +3,7 @@ "displayName": "P50 Single-Channel GEN1", "model": "p50", "displayCategory": "GEN1", - "majorVersion": 1, - "minorVersion": 5, "pickUpTipConfigurations": { - "current": 0.1, "speed": 30.0, "presses": 3, "increment": 1.0, @@ -36,7 +33,10 @@ }, "partialTipConfigurations": { "partialTipSupported": false, - "availableConfigurations": null + "availableConfigurations": null, + "perTipPickupCurrent": { + "1": 0.1 + } }, "channels": 1, "shaftDiameter": 2.0, 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 32b0e88ab38..ac78ce6b439 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.15, "presses": 1, "speed": 5, "increment": 0.0, @@ -45,7 +44,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.15 + } }, "backCompatNames": [], "channels": 1, 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 32b0e88ab38..ac78ce6b439 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.15, "presses": 1, "speed": 5, "increment": 0.0, @@ -45,7 +44,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.15 + } }, "backCompatNames": [], "channels": 1, 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 470c9a9985c..66fb9ba7bd3 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.2, "presses": 1, "speed": 10, "increment": 0.0, @@ -45,7 +44,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.2 + } }, "backCompatNames": [], "channels": 1, 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 470c9a9985c..66fb9ba7bd3 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 @@ -4,7 +4,6 @@ "model": "p50", "displayCategory": "FLEX", "pickUpTipConfigurations": { - "current": 0.2, "presses": 1, "speed": 10, "increment": 0.0, @@ -45,7 +44,10 @@ } }, "partialTipConfigurations": { - "partialTipSupported": false + "partialTipSupported": false, + "perTipPickupCurrent": { + "1": 0.2 + } }, "backCompatNames": [], "channels": 1, diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py index a6ac2a58cc2..c6421bb009a 100644 --- a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py +++ b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py @@ -141,7 +141,7 @@ class PlungerPositions(BaseModel): class PlungerHomingConfigurations(BaseModel): current: float = Field( - ..., + default=None, description="Either the z motor current needed for picking up tip or the plunger motor current for dropping tip off the nozzle.", ) speed: float = Field( @@ -181,7 +181,7 @@ class PartialTipDefinition(BaseModel): alias="availableConfigurations", ) per_tip_pickup_current: Dict[int, float] = Field( - default=None, + ..., description="A current dictionary look-up by partial tip configuration.", alias="perTipPickupCurrent", )