remove unmergable code

Opentrons · May 31, 2024 · d6a57c6 · d6a57c6
1 parent 380cf99
commit d6a57c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/hardware-testing/Makefile b/hardware-testing/Makefile
@@ -277,6 +277,16 @@ push-ot3-fixture:
 	$(MAKE) remove-patches-fixture
 
 
+.PHONY: push-ot3-lld
+push-ot3-lld:
+	$(MAKE) apply-patches-fixture
+	cd ../ && $(MAKE) -C shared-data push-ot3
+	cd ../ && $(MAKE) -C hardware push-ot3
+	cd ../ && $(MAKE) -C hardware_testing push-ot3
+	cd ../ && $(MAKE) -C api push-ot3
+	$(MAKE) remove-patches-fixture
+
+
 .PHONY: apply-patches-fixture
 apply-patches-fixture:
 	cd ../ && git apply ./hardware-testing/fixture_overrides/*.patch --allow-empty

diff --git a/hardware/opentrons_hardware/hardware_control/motion_planning/move_utils.py b/hardware/opentrons_hardware/hardware_control/motion_planning/move_utils.py
@@ -24,7 +24,7 @@
 
 FLOAT_THRESHOLD = 0.001  # TODO: re-evaluate this value based on system limitations
 
-MINIMUM_DISPLACEMENT = 0.01  # NOTE: (sigler) DO NOT MERGE!!!!!!!
+MINIMUM_DISPLACEMENT = 0.05
 
 # Minimum vector component of 0.1%
 MINIMUM_VECTOR_COMPONENT = np.float64(0.001)