From b64f923e08890a9fe349c54c2fc789b3cf4ccbaa Mon Sep 17 00:00:00 2001 From: Sanniti Date: Mon, 18 Sep 2023 17:02:50 -0400 Subject: [PATCH 1/3] fix x, y coordinates of td calib adapter well a1 --- .../2/opentrons_calibration_adapter_temperature_module/1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-data/labware/definitions/2/opentrons_calibration_adapter_temperature_module/1.json b/shared-data/labware/definitions/2/opentrons_calibration_adapter_temperature_module/1.json index 0a533fb5da4..0c6fbe6bd77 100644 --- a/shared-data/labware/definitions/2/opentrons_calibration_adapter_temperature_module/1.json +++ b/shared-data/labware/definitions/2/opentrons_calibration_adapter_temperature_module/1.json @@ -22,8 +22,8 @@ "shape": "rectangular", "xDimension": 20, "yDimension": 20, - "x": 64, - "y": 43, + "x": 63.875, + "y": 42.75, "z": 10.25 }, "B1": { From f12300f02bd539a3ab317eff1d3c7193acb85f42 Mon Sep 17 00:00:00 2001 From: Sanniti Date: Mon, 18 Sep 2023 17:03:38 -0400 Subject: [PATCH 2/3] fix h/s labware offset for Flex and OT2 --- .../definitions/3/heaterShakerModuleV1.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/shared-data/module/definitions/3/heaterShakerModuleV1.json b/shared-data/module/definitions/3/heaterShakerModuleV1.json index 63d6dd31998..a49111f0a52 100644 --- a/shared-data/module/definitions/3/heaterShakerModuleV1.json +++ b/shared-data/module/definitions/3/heaterShakerModuleV1.json @@ -5,7 +5,7 @@ "labwareOffset": { "x": -0.125, "y": 1.125, - "z": 68.275 + "z": 68.525 }, "dimensions": { "bareOverallHeight": 82, @@ -107,7 +107,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -115,7 +115,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -123,7 +123,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -131,7 +131,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -139,7 +139,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -147,7 +147,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] }, @@ -155,7 +155,7 @@ "labwareOffset": [ [1, 0, 0, 0.125], [0, 1, 0, -1.125], - [0, 0, 1, -49.325], + [0, 0, 1, -50.175], [0, 0, 0, 1] ] } From 89ba176e9b8abf17cf479a7c23ca5f89fe1b84c6 Mon Sep 17 00:00:00 2001 From: Sanniti Date: Tue, 3 Oct 2023 08:18:46 -0400 Subject: [PATCH 3/3] updated tests --- .../opentrons/protocol_engine/state/test_module_view.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/tests/opentrons/protocol_engine/state/test_module_view.py b/api/tests/opentrons/protocol_engine/state/test_module_view.py index 7c9a3a9dc90..91ef6d2c9a1 100644 --- a/api/tests/opentrons/protocol_engine/state/test_module_view.py +++ b/api/tests/opentrons/protocol_engine/state/test_module_view.py @@ -300,12 +300,12 @@ def test_get_properties_by_id( ( lazy_fixture("heater_shaker_v1_def"), DeckSlotName.SLOT_1, - LabwareOffsetVector(x=-0.125, y=1.125, z=68.275), + LabwareOffsetVector(x=-0.125, y=1.125, z=68.525), ), ( lazy_fixture("heater_shaker_v1_def"), DeckSlotName.SLOT_3, - LabwareOffsetVector(x=0.125, y=-1.125, z=68.275), + LabwareOffsetVector(x=0.125, y=-1.125, z=68.525), ), ], ) @@ -350,12 +350,12 @@ def test_get_module_offset_for_ot2_standard( ( lazy_fixture("heater_shaker_v1_def"), DeckSlotName.SLOT_1.to_ot3_equivalent(), - LabwareOffsetVector(x=0, y=0, z=18.95), + LabwareOffsetVector(x=0, y=0, z=18.35), ), ( lazy_fixture("heater_shaker_v1_def"), DeckSlotName.SLOT_3.to_ot3_equivalent(), - LabwareOffsetVector(x=0, y=0, z=18.95), + LabwareOffsetVector(x=0, y=0, z=18.35), ), ( lazy_fixture("mag_block_v1_def"),