update schema v1 build script, other missed updates

Opentrons · Feb 8, 2024 · 16a569a · 16a569a
1 parent d4c2189
commit 16a569a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/shared-data/python/opentrons_shared_data/pipette/model_constants.py b/shared-data/python/opentrons_shared_data/pipette/model_constants.py
@@ -66,10 +66,20 @@
         "currentByTipCount",
         "##EACHTIP##",
     ],
-    "pickUpDistance": ["pickUpTipConfigurations", "pressFit", "distance"],
+    "pickUpDistance": [
+        "pickUpTipConfigurations",
+        "pressFit",
+        "distanceByTipCount",
+        "##EACHTIP##",
+    ],
     "pickUpIncrement": ["pickUpTipConfigurations", "pressFit", "increment"],
     "pickUpPresses": ["pickUpTipConfigurations", "pressFit", "presses"],
-    "pickUpSpeed": ["pickUpTipConfigurations", "pressFit", "speed"],
+    "pickUpSpeed": [
+        "pickUpTipConfigurations",
+        "pressFit",
+        "speedByTipCount",
+        "##EACHTIP##",
+    ],
     "plungerCurrent": ["plungerMotorConfigurations", "run"],
     "dropTipCurrent": ["dropTipConfigurations", "plungerEject", "current"],
     "dropTipSpeed": ["dropTipConfigurations", "plungerEject", "speed"],

diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py
@@ -60,13 +60,15 @@ def _build_pickup_tip_data(
         distance = float(
             input("please provide the starting distance for pick up tip\n")
         )
-    print(f"TODO: Current {current} is not used yet")
+    print(
+        f"TODO: Current {current}, speed {speed} and distance {distance} is not used yet"
+    )
     return PickUpTipConfigurations(
         pressFit=PressFitPickUpTipConfiguration(
-            speed=speed,
+            speedByTipCount={},
             presses=presses,
             increment=increment,
-            distance=distance,
+            distanceByTipCount={},
             currentByTipCount={},
         )
     )

diff --git a/shared-data/python/tests/pipette/test_mutable_configurations.py b/shared-data/python/tests/pipette/test_mutable_configurations.py
@@ -269,7 +269,9 @@ def test_load_with_overrides(
 
     if serial_number == TEST_SERIAL_NUMBER:
         dict_loaded_configs = loaded_base_configurations.dict(by_alias=True)
-        dict_loaded_configs["pickUpTipConfigurations"]["pressFit"]["speed"] = 5.0
+        dict_loaded_configs["pickUpTipConfigurations"]["pressFit"][
+            "speedByTipCount"
+        ] = 5.0
         updated_configurations_dict = updated_configurations.dict(by_alias=True)
         assert set(dict_loaded_configs.pop("quirks")) == set(
             updated_configurations_dict.pop("quirks")