From 7cd582a9fd28993b9f61254fef48ebd49ba6b7c6 Mon Sep 17 00:00:00 2001
From: Jerome <1458798121@qq.com>
Date: Wed, 28 Jun 2023 10:29:39 +0800
Subject: [PATCH 1/2] Fix can not load reservoir issue

---
 .../hardware_testing/gravimetric/__main__.py  | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/hardware-testing/hardware_testing/gravimetric/__main__.py b/hardware-testing/hardware_testing/gravimetric/__main__.py
index a79749994dd..fbf98299dc8 100644
--- a/hardware-testing/hardware_testing/gravimetric/__main__.py
+++ b/hardware-testing/hardware_testing/gravimetric/__main__.py
@@ -17,6 +17,10 @@
     gravimetric_ot3_p1000_96_1000ul_tip,
     photometric_ot3_p1000_96_50ul_tip,
     photometric_ot3_p1000_96_200ul_tip,
+    gravimetric_ot3_p50_multi_50ul_tip_increment,
+    gravimetric_ot3_p1000_multi_50ul_tip_increment,
+    gravimetric_ot3_p1000_multi_200ul_tip_increment,
+    gravimetric_ot3_p1000_multi_1000ul_tip_increment,
 )
 
 from . import execute, helpers, workarounds, execute_photometric
@@ -53,6 +57,30 @@
     },
 }
 
+GRAVIMETRIC_CFG_INCREMENT = {
+    50: {
+        1: {50: gravimetric_ot3_p50_single},
+        8: {50: gravimetric_ot3_p50_multi_50ul_tip_increment},
+    },
+    1000: {
+        1: {
+            50: gravimetric_ot3_p1000_single,
+            200: gravimetric_ot3_p1000_single,
+            1000: gravimetric_ot3_p1000_single,
+        },
+        8: {
+            50: gravimetric_ot3_p1000_multi_50ul_tip_increment,
+            200: gravimetric_ot3_p1000_multi_200ul_tip_increment,
+            1000: gravimetric_ot3_p1000_multi_1000ul_tip_increment,
+        },
+        96: {
+            50: gravimetric_ot3_p1000_96_50ul_tip,
+            200: gravimetric_ot3_p1000_96_200ul_tip,
+            1000: gravimetric_ot3_p1000_96_1000ul_tip,
+        },
+    },
+}
+
 PHOTOMETRIC_CFG = {
     50: photometric_ot3_p1000_96_50ul_tip,
     200: photometric_ot3_p1000_96_200ul_tip,
@@ -75,7 +103,10 @@ def run_gravimetric(
     scale_delay: int,
 ) -> None:
     """Run."""
-    protocol_cfg = GRAVIMETRIC_CFG[pipette_volume][pipette_channels][tip_volume]
+    if increment:
+        protocol_cfg = GRAVIMETRIC_CFG_INCREMENT[pipette_volume][pipette_channels][tip_volume]
+    else:
+        protocol_cfg = GRAVIMETRIC_CFG[pipette_volume][pipette_channels][tip_volume]
     execute.run(
         protocol,
         GravimetricConfig(
@@ -173,7 +204,10 @@ def run_photometric(
             print(f"\t\t{offset['definitionUri']}")
             print(f"\t\t{offset['vector']}")
             LABWARE_OFFSETS.append(offset)
-    _protocol = GRAVIMETRIC_CFG[args.pipette][args.channels][args.tip]
+    if args.increment:
+        _protocol = GRAVIMETRIC_CFG_INCREMENT[args.pipette][args.channels][args.tip]
+    else:
+        _protocol = GRAVIMETRIC_CFG[args.pipette][args.channels][args.tip]
     _ctx = helpers.get_api_context(
         API_LEVEL,  # type: ignore[attr-defined]
         is_simulating=args.simulate,

From 6b618ec468a8d98078e471ca35ebac27acc33677 Mon Sep 17 00:00:00 2001
From: andySigler <andrewsigler1@gmail.com>
Date: Wed, 28 Jun 2023 10:02:44 -0400
Subject: [PATCH 2/2] linting

---
 hardware-testing/hardware_testing/gravimetric/__main__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hardware-testing/hardware_testing/gravimetric/__main__.py b/hardware-testing/hardware_testing/gravimetric/__main__.py
index fbf98299dc8..e57697e5261 100644
--- a/hardware-testing/hardware_testing/gravimetric/__main__.py
+++ b/hardware-testing/hardware_testing/gravimetric/__main__.py
@@ -104,7 +104,9 @@ def run_gravimetric(
 ) -> None:
     """Run."""
     if increment:
-        protocol_cfg = GRAVIMETRIC_CFG_INCREMENT[pipette_volume][pipette_channels][tip_volume]
+        protocol_cfg = GRAVIMETRIC_CFG_INCREMENT[pipette_volume][pipette_channels][
+            tip_volume
+        ]
     else:
         protocol_cfg = GRAVIMETRIC_CFG[pipette_volume][pipette_channels][tip_volume]
     execute.run(