fixups from mergeing the 20ul branch and add 20ul tests to the p200

Opentrons · Nov 14, 2024 · fe25ab4 · fe25ab4
1 parent 75b8260
commit fe25ab4
Show file tree

Hide file tree

Showing 12 changed files with 1,221 additions and 38 deletions.
diff --git a/hardware-testing/Makefile b/hardware-testing/Makefile
@@ -103,6 +103,7 @@ test-photometric:
 	$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 1000 --channels 96 --tip 50 --trials 1
 	$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 1000 --channels 96 --tip 200 --trials 1
 	$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 200 --channels 96 --tip 50 --trials 1
+	$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 200 --channels 96 --tip 20 --trials 1
 	-$(MAKE) remove-patches-gravimetric
 
 .PHONY: test-gravimetric-single

diff --git a/hardware-testing/hardware_testing/gravimetric/__main__.py b/hardware-testing/hardware_testing/gravimetric/__main__.py
@@ -67,24 +67,10 @@
         96: gravimetric_ot3_p1000_96,
     },
 }
-CAVITY_GRAVIMETRIC_CFG = {
-    50: {
-        1: {
-            20: gravimetric_cavity_ot3_p50_single,
-            50: gravimetric_cavity_ot3_p50_single
-        },
-    },
-    1000: {
-        96: gravimetric_ot3_p1000_96,
-    },
-}
 
 GRAVIMETRIC_CFG_INCREMENT = {
     50: {
-        1: {
-            20: gravimetric_ot3_p50_single,
-            50: gravimetric_ot3_p50_single
-        },
+        1: {20: gravimetric_ot3_p50_single, 50: gravimetric_ot3_p50_single},
         8: {50: gravimetric_ot3_p50_multi_50ul_tip_increment},
     },
     200: {
@@ -123,7 +109,11 @@
         },
     },
     200: {
-        96: {50: photometric_ot3_p200_96, 200: photometric_ot3_p200_96},
+        96: {
+            20: photometric_ot3_p200_96,
+            50: photometric_ot3_p200_96,
+            200: photometric_ot3_p200_96,
+        },
     },
     1000: {
         1: {
@@ -136,7 +126,11 @@
             200: photometric_ot3_p1000_multi,
             1000: photometric_ot3_p1000_multi,
         },
-        96: {20: photometric_ot3_p1000_96, 50: photometric_ot3_p1000_96, 200: photometric_ot3_p1000_96},
+        96: {
+            20: photometric_ot3_p1000_96,
+            50: photometric_ot3_p1000_96,
+            200: photometric_ot3_p1000_96,
+        },
     },
 }
 
@@ -187,6 +181,7 @@ def _get_protocol_context(cls, args: argparse.Namespace) -> ProtocolContext:
             labware_dir = Path(__file__).parent.parent / "labware"
             custom_def_uris = [
                 "radwag_pipette_calibration_vial",
+                "opentrons_flex_96_tiprack_20ul_adp",
                 "opentrons_flex_96_tiprack_50ul_adp",
                 "opentrons_flex_96_tiprack_200ul_adp",
                 "opentrons_flex_96_tiprack_1000ul_adp",

diff --git a/hardware-testing/hardware_testing/gravimetric/config.py b/hardware-testing/hardware_testing/gravimetric/config.py
@@ -312,7 +312,8 @@ def _get_liquid_probe_settings(
     },
     96: {
         200: [
-            (50, [1.0, 5.0]),  # T50
+            (20, [1.0, 0.5]),  # T50
+            (50, [1.0]),  # T50
             (200, [200.0]),  # T200
         ],
         1000: [  # P1000
@@ -400,6 +401,15 @@ def _get_liquid_probe_settings(
     },
     96: {
         200: {
+             20: {  # T20
+                0.5: (2.5, 2.0),
+                1.0: (2.5, 2.0),
+                2.0: (2.5, 2.0),
+                3.0: (2.5, 2.0),
+                5.0: (2.5, 2.0),
+                10.0: (3.1, 1.7),
+                20.0: (3.1, 1.7),
+            },
             50: {  # T50
                 1.0: (2.5, 2.0),
                 2.0: (2.5, 2.0),

diff --git a/hardware-testing/hardware_testing/gravimetric/execute_photometric.py b/hardware-testing/hardware_testing/gravimetric/execute_photometric.py
@@ -47,6 +47,7 @@
     "B": {"min": 10, "max": 49.99},
     "C": {"min": 2, "max": 9.999},
     "D": {"min": 1, "max": 1.999},
+    "E": {"min": 0, "max": 0.9999},
 }
 _MIN_START_VOLUME_UL = {1: 500, 8: 3000, 96: 30000}
 _MIN_END_VOLUME_UL = {1: 400, 8: 3000, 96: 10000}

diff --git a/hardware-testing/hardware_testing/gravimetric/helpers.py b/hardware-testing/hardware_testing/gravimetric/helpers.py
@@ -402,6 +402,7 @@ def _load_tipracks(
         )
         for slot in cfg.slots_tiprack
     ]
+    print(f"LOAD TIPRack{use_adapters}")
     for ls in tiprack_load_settings:
         ui.print_info(f'Loading tiprack "{ls[1]}" in slot #{ls[0]}')
     if use_adapters:

diff --git a/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py b/hardware-testing/hardware_testing/gravimetric/liquid_class/defaults.py
@@ -415,6 +415,35 @@
             },
         },
         200: {  # P200
+            20: {  # T20
+                1: DispenseSettings(  # 5uL
+                    z_submerge_depth=_default_submerge_dispense_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=80,  # ul/sec
+                    delay=_default_dispense_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    blow_out_submerged=5,
+                ),
+                5: DispenseSettings(  # 10uL
+                    z_submerge_depth=_default_submerge_dispense_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=80,  # ul/sec
+                    delay=_default_dispense_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    blow_out_submerged=5,
+                ),
+                20: DispenseSettings(  # 50uL
+                    z_submerge_depth=_default_submerge_dispense_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=80,  # ul/sec
+                    delay=_default_dispense_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    blow_out_submerged=5,
+                ),
+            },
             50: {  # T50
                 5: DispenseSettings(  # 5uL
                     z_submerge_depth=_default_submerge_dispense_mm,
@@ -910,6 +939,38 @@
             },
         },
         200: {  # P200
+            20: {  # T20
+                1: AspirateSettings(  # 5uL
+                    z_submerge_depth=_default_submerge_aspirate_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=6.5,  # ul/sec
+                    delay=_default_aspirate_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    leading_air_gap=0,
+                    trailing_air_gap=0.1,
+                ),
+                5: AspirateSettings(  # 10uL
+                    z_submerge_depth=_default_submerge_aspirate_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=6.5,  # ul/sec
+                    delay=_default_aspirate_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    leading_air_gap=0,
+                    trailing_air_gap=0.1,
+                ),
+                20: AspirateSettings(  # 50uL
+                    z_submerge_depth=_default_submerge_aspirate_mm,
+                    plunger_acceleration=_default_accel_96ch_ul_sec_sec,
+                    plunger_flow_rate=6.5,  # ul/sec
+                    delay=_default_aspirate_delay_seconds,
+                    z_retract_discontinuity=_default_retract_discontinuity,
+                    z_retract_height=_default_retract_mm,
+                    leading_air_gap=0,
+                    trailing_air_gap=0.1,
+                ),
+            },
             50: {  # T50
                 5: AspirateSettings(  # 5uL
                     z_submerge_depth=_default_submerge_aspirate_mm,