make increment test work for 200ul 96

Opentrons · Nov 14, 2024 · 82183d6 · 82183d6
1 parent fe25ab4
commit 82183d6
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 21 deletions.
diff --git a/hardware-testing/Makefile b/hardware-testing/Makefile
@@ -128,6 +128,7 @@ test-gravimetric-multi:
 test-gravimetric-96:
 	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --channels 96 --trials 2 --no-blank
 	$(python) -m hardware_testing.gravimetric --simulate --pipette 200 --channels 96 --trials 2 --no-blank
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 200 --channels 96 --trials 1 --no-blank --increment --tip 20
 
 .PHONY: test-gravimetric
 test-gravimetric:

diff --git a/hardware-testing/hardware_testing/gravimetric/__main__.py b/hardware-testing/hardware_testing/gravimetric/__main__.py
@@ -75,6 +75,7 @@
     },
     200: {
         96: {
+            20: gravimetric_ot3_p200_96,
             50: gravimetric_ot3_p200_96,
             200: gravimetric_ot3_p200_96,
         },

diff --git a/hardware-testing/hardware_testing/gravimetric/config.py b/hardware-testing/hardware_testing/gravimetric/config.py
@@ -114,12 +114,23 @@ class PhotometricConfig(VolumetricConfig):
     },
     200: {
         96: {
+            20: {
+                "max_z_distance": 20,
+                "min_z_distance": 5,
+                "mount_speed": 5,
+                "plunger_speed": 10,
+                "sensor_threshold_pascals": 15,
+            },
             50: {
+                "max_z_distance": 20,
+                "min_z_distance": 5,
                 "mount_speed": 5,
                 "plunger_speed": 20,
                 "sensor_threshold_pascals": 15,
             },
             200: {
+                "max_z_distance": 20,
+                "min_z_distance": 5,
                 "mount_speed": 5,
                 "plunger_speed": 20,
                 "sensor_threshold_pascals": 15,
@@ -174,6 +185,13 @@ class PhotometricConfig(VolumetricConfig):
             },
         },
         96: {
+            20: {
+                "max_z_distance": 20,
+                "min_z_distance": 5,
+                "mount_speed": 5,
+                "plunger_speed": 10,
+                "sensor_threshold_pascals": 15,
+            },
             50: {
                 "max_z_distance": 20,
                 "min_z_distance": 5,
@@ -246,6 +264,7 @@ def _get_liquid_probe_settings(
     },
     96: {
         200: [
+            (20, [0.5, 1.0]),  # T20
             (50, [1.0, 50.0]),  # T50
             (200, [200.0]),  # T200
         ],

diff --git a/hardware-testing/hardware_testing/gravimetric/increments.py b/hardware-testing/hardware_testing/gravimetric/increments.py
@@ -267,6 +267,21 @@
     },
     96: {
         200: {
+            20: {
+                "default": [
+                    0.2000,
+                    0.500,
+                    1.000,
+                    3.000,
+                    5.000,
+                    7.000,
+                    8.000,
+                    9.000,
+                    10.000,
+                    15.000,
+                    22.000,
+                ],
+            },
             50: {
                 "default": [
                     2.000,
@@ -283,27 +298,6 @@
                     40.000,
                     60.000,
                 ],
-                "lowVolumeDefault": [
-                    1.100,
-                    1.200,
-                    1.370,
-                    1.700,
-                    2.040,
-                    2.660,
-                    3.470,
-                    3.960,
-                    4.350,
-                    4.800,
-                    5.160,
-                    5.890,
-                    6.730,
-                    8.200,
-                    10.020,
-                    11.100,
-                    14.910,
-                    28.940,
-                    48.27,
-                ],
             },
             200: {
                 "default": [

diff --git a/hardware-testing/hardware_testing/opentrons_api/helpers_ot3.py b/hardware-testing/hardware_testing/opentrons_api/helpers_ot3.py
@@ -1116,6 +1116,8 @@ def _ul_per_mm_of_shaft_diameter(diameter: float) -> float:
         pip_nominal_ul_per_mm = _ul_per_mm_of_shaft_diameter(1)
     elif "p1000" in pip.model.lower():
         pip_nominal_ul_per_mm = _ul_per_mm_of_shaft_diameter(4.5)
+    elif "p200" in pip.model.lower():
+        pip_nominal_ul_per_mm = _ul_per_mm_of_shaft_diameter(3.14159)
     else:
         raise RuntimeError(f"unexpected pipette model: {pip.model}")
     # 10000 is an arbitrarily large volume that none of our pipettes can reach

diff --git a/...testing/hardware_testing/protocols/gravimetric_lpc/gravimetric/gravimetric_ot3_p200_96.py b/...testing/hardware_testing/protocols/gravimetric_lpc/gravimetric/gravimetric_ot3_p200_96.py
@@ -8,6 +8,7 @@
 SLOT_SCALE = 4
 SLOTS_TIPRACK = {
     # TODO: add slot 12 when tipracks are disposable
+    20: [2, 3, 5, 6, 7, 8, 9, 10, 11],
     50: [2, 3, 5, 6, 7, 8, 9, 10, 11],
     200: [2, 3, 5, 6, 7, 8, 9, 10, 11],
 }

diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/1_0.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/1_0.json
@@ -1,6 +1,57 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 189.1,
+      "defaultAspirateFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 6,
+        "valuesByApiLevel": { "2.14": 6 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 80,
+        "valuesByApiLevel": { "2.14": 80 }
+      },
+      "defaultFlowAcceleration": 16000.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.6,
+      "aspirate": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [1.933333, 2.844459, 4.750159],
+            [2.833333, 1.12901, 8.066694],
+            [3.603333, 0.254744, 10.543779],
+            [4.836667, 1.101839, 7.491414],
+            [5.755, 0.277649, 11.47775],
+            [6.643333, 0.14813, 12.223126],
+            [7.548333, 0.145635, 12.239705],
+            [8.475, 0.15097, 12.199433],
+            [13.02, 0.071736, 12.870946],
+            [22.318333, 0.042305, 13.254131]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
     "t50": {
       "defaultAspirateFlowRate": {
         "default": 6,