From bce6cd09bfc98ccf88ebdda21ee3adaa36b43448 Mon Sep 17 00:00:00 2001 From: Sanniti Pimpley Date: Wed, 4 Dec 2024 14:27:16 -0500 Subject: [PATCH] refactor(robot-server): use different pipette IDs for OT2 vs Flex dev servers (#17031) # Overview The OT2 and Flex pipette calibration data format is slightly different. In the simulator setup file, we have the OT2 & Flex pipette IDs the same so the calibration files get unintentionally shared between OT2 & Flex. When switching between OT2 and Flex dev servers, the difference in data format causes a validation error and we have to re-calibrate the pipettes (or update the files) each time. It's quite annoying to have to do this so I am changing the Flex's pipette ID so that we'll be able to use separate calibration files for flex & OT2 pipettes. ## Risk assessment None. Dev server change only --- .../service/notifications/publisher_notifier.py | 4 ++-- robot-server/simulators/test-flex.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/robot-server/robot_server/service/notifications/publisher_notifier.py b/robot-server/robot_server/service/notifications/publisher_notifier.py index 4701aa83718..5540d35de11 100644 --- a/robot-server/robot_server/service/notifications/publisher_notifier.py +++ b/robot-server/robot_server/service/notifications/publisher_notifier.py @@ -52,9 +52,9 @@ async def _wait_for_event(self) -> None: f'PublisherNotifier: exception in callback {getattr(callback, "__name__", "")}' ) except asyncio.exceptions.CancelledError: - LOG.warning("PublisherNotifuer task cancelled.") + LOG.warning("PublisherNotifier task cancelled.") except BaseException: - LOG.exception("PublisherNotifer notify task failed") + LOG.exception("PublisherNotifier notify task failed") _pe_publisher_notifier_accessor: AppStateAccessor[PublisherNotifier] = AppStateAccessor[ diff --git a/robot-server/simulators/test-flex.json b/robot-server/simulators/test-flex.json index 34544cfa099..70d5f83de47 100644 --- a/robot-server/simulators/test-flex.json +++ b/robot-server/simulators/test-flex.json @@ -4,15 +4,15 @@ "attached_instruments": { "right": { "model": "p1000_single_3.4", - "id": "321" + "id": "321_flex" }, "left": { "model": "p50_single_3.4", - "id": "123" + "id": "123_flex" }, "gripper":{ "model": "gripper_1.3", - "id": "1234" + "id": "1234_flex_gripper" } }, "attached_modules": {