update per tip currents and remove pick up current config

Opentrons · Oct 9, 2023 · decafda · decafda
1 parent 6eab794
commit decafda
Show file tree

Hide file tree

Showing 68 changed files with 403 additions and 384 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": [],