diff --git a/api/src/opentrons/protocol_api/_liquid_properties.py b/api/src/opentrons/protocol_api/_liquid_properties.py index ebb903591ea..5ba19d98a53 100644 --- a/api/src/opentrons/protocol_api/_liquid_properties.py +++ b/api/src/opentrons/protocol_api/_liquid_properties.py @@ -126,7 +126,7 @@ class TouchTipProperties: _enabled: bool _z_offset: Optional[float] - _mm_to_edge: Optional[float] + _mm_from_edge: Optional[float] _speed: Optional[float] @property @@ -137,10 +137,10 @@ def enabled(self) -> bool: def enabled(self, enable: bool) -> None: validated_enable = validation.ensure_boolean(enable) if validated_enable and ( - self._z_offset is None or self._mm_to_edge is None or self._speed is None + self._z_offset is None or self._mm_from_edge is None or self._speed is None ): raise ValueError( - "z_offset, mm_to_edge and speed must be set before enabling touch tip." + "z_offset, mm_from_edge and speed must be set before enabling touch tip." ) self._enabled = validated_enable @@ -154,13 +154,13 @@ def z_offset(self, new_offset: float) -> None: self._z_offset = validated_offset @property - def mm_to_edge(self) -> Optional[float]: - return self._mm_to_edge + def mm_from_edge(self) -> Optional[float]: + return self._mm_from_edge - @mm_to_edge.setter - def mm_to_edge(self, new_mm: float) -> None: + @mm_from_edge.setter + def mm_from_edge(self, new_mm: float) -> None: validated_mm = validation.ensure_float(new_mm) - self._mm_to_edge = validated_mm + self._mm_from_edge = validated_mm @property def speed(self) -> Optional[float]: @@ -175,12 +175,12 @@ def _get_shared_data_params(self) -> Optional[SharedDataTouchTipParams]: """Get the touch tip params in schema v1 shape.""" if ( self._z_offset is not None - and self._mm_to_edge is not None + and self._mm_from_edge is not None and self._speed is not None ): return SharedDataTouchTipParams( zOffset=self._z_offset, - mmToEdge=self._mm_to_edge, + mmFromEdge=self._mm_from_edge, speed=self._speed, ) else: @@ -591,16 +591,16 @@ def _build_touch_tip_properties( ) -> TouchTipProperties: if touch_tip_properties.params is not None: z_offset = touch_tip_properties.params.zOffset - mm_to_edge = touch_tip_properties.params.mmToEdge + mm_from_edge = touch_tip_properties.params.mmFromEdge speed = touch_tip_properties.params.speed else: z_offset = None - mm_to_edge = None + mm_from_edge = None speed = None return TouchTipProperties( _enabled=touch_tip_properties.enable, _z_offset=z_offset, - _mm_to_edge=mm_to_edge, + _mm_from_edge=mm_from_edge, _speed=speed, ) diff --git a/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py b/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py index 7dc332e6a37..b8bf2b8d47c 100644 --- a/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py +++ b/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py @@ -291,7 +291,7 @@ def retract_after_aspiration(self, volume: float) -> None: assert ( touch_tip_props.speed is not None and touch_tip_props.z_offset is not None - and touch_tip_props.mm_to_edge is not None + and touch_tip_props.mm_from_edge is not None ) self._instrument.touch_tip( location=retract_location, @@ -299,7 +299,7 @@ def retract_after_aspiration(self, volume: float) -> None: radius=1, z_offset=touch_tip_props.z_offset, speed=touch_tip_props.speed, - mm_from_edge=touch_tip_props.mm_to_edge, + mm_from_edge=touch_tip_props.mm_from_edge, ) self._instrument.move_to( location=retract_location, @@ -458,7 +458,7 @@ def _do_touch_tip_and_air_gap( assert ( touch_tip_props.speed is not None and touch_tip_props.z_offset is not None - and touch_tip_props.mm_to_edge is not None + and touch_tip_props.mm_from_edge is not None ) # TODO:, check that when blow out is a non-dest-well, # whether the touch tip params from transfer props should be used for @@ -471,7 +471,7 @@ def _do_touch_tip_and_air_gap( radius=1, z_offset=touch_tip_props.z_offset, speed=touch_tip_props.speed, - mm_from_edge=touch_tip_props.mm_to_edge, + mm_from_edge=touch_tip_props.mm_from_edge, ) except TouchTipDisabledError: # TODO: log a warning diff --git a/api/tests/opentrons/conftest.py b/api/tests/opentrons/conftest.py index 60386d5a140..6ca7373d593 100755 --- a/api/tests/opentrons/conftest.py +++ b/api/tests/opentrons/conftest.py @@ -904,7 +904,7 @@ def maximal_liquid_class_def() -> LiquidClassSchemaV1: touchTip=TouchTipProperties( enable=True, params=LiquidClassTouchTipParams( - zOffset=-1, mmToEdge=0.5, speed=30 + zOffset=-1, mmFromEdge=0.5, speed=30 ), ), delay=DelayProperties( @@ -947,7 +947,7 @@ def maximal_liquid_class_def() -> LiquidClassSchemaV1: touchTip=TouchTipProperties( enable=True, params=LiquidClassTouchTipParams( - zOffset=-1, mmToEdge=0.75, speed=30 + zOffset=-1, mmFromEdge=0.75, speed=30 ), ), delay=DelayProperties( @@ -990,7 +990,7 @@ def maximal_liquid_class_def() -> LiquidClassSchemaV1: touchTip=TouchTipProperties( enable=False, params=LiquidClassTouchTipParams( - zOffset=-1, mmToEdge=0.5, speed=30 + zOffset=-1, mmFromEdge=0.5, speed=30 ), ), delay=DelayProperties( diff --git a/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py b/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py index 87870468590..a42dcf633a5 100644 --- a/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py +++ b/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py @@ -51,7 +51,7 @@ def sample_transfer_props( "offset": {"x": 3, "y": 2, "z": 1}, "speed": 50, "airGapByVolume": [[1.0, 0.1], [49.9, 0.1], [50.0, 0.0]], - "touchTip": {"enable": true, "params": {"zOffset": -1, "mmToEdge": 0.5, "speed": 30}}, + "touchTip": {"enable": true, "params": {"zOffset": -1, "mmFromEdge": 0.5, "speed": 30}}, "delay": {"enable": true, "params": {"duration": 20}}}, "positionReference": "well-bottom", "offset": {"x": 10, "y": 20, "z": 30}, @@ -537,7 +537,7 @@ def test_retract_after_aspiration_without_touch_tip_and_delay( "speed": 50, "airGapByVolume": [[1.0, 0.1], [49.9, 0.1], [50.0, 0.0]], "blowout": { "enable": true , "params": {"location": "source", "flowRate": 100}}, - "touchTip": { "enable": true, "params": { "zOffset": -1, "mmToEdge": 0.5, "speed": 30}}, + "touchTip": { "enable": true, "params": { "zOffset": -1, "mmFromEdge": 0.5, "speed": 30}}, "delay": {"enable": true, "params": { "duration": 10 }} }, "positionReference": "well-bottom", diff --git a/api/tests/opentrons/protocol_api/test_liquid_class_properties.py b/api/tests/opentrons/protocol_api/test_liquid_class_properties.py index ee269f378d5..fc86bfcfa52 100644 --- a/api/tests/opentrons/protocol_api/test_liquid_class_properties.py +++ b/api/tests/opentrons/protocol_api/test_liquid_class_properties.py @@ -37,7 +37,7 @@ def test_build_aspirate_settings() -> None: } assert aspirate_properties.retract.touch_tip.enabled is True assert aspirate_properties.retract.touch_tip.z_offset == 2 - assert aspirate_properties.retract.touch_tip.mm_to_edge == 1 + assert aspirate_properties.retract.touch_tip.mm_from_edge == 1 assert aspirate_properties.retract.touch_tip.speed == 50 assert aspirate_properties.retract.delay.enabled is True assert aspirate_properties.retract.delay.duration == 1 @@ -87,8 +87,8 @@ def test_aspirate_settings_overrides() -> None: assert aspirate_properties.retract.touch_tip.enabled is False aspirate_properties.retract.touch_tip.z_offset = 2.34 assert aspirate_properties.retract.touch_tip.z_offset == 2.34 - aspirate_properties.retract.touch_tip.mm_to_edge = 4.56 - assert aspirate_properties.retract.touch_tip.mm_to_edge == 4.56 + aspirate_properties.retract.touch_tip.mm_from_edge = 4.56 + assert aspirate_properties.retract.touch_tip.mm_from_edge == 4.56 aspirate_properties.retract.touch_tip.speed = 501 assert aspirate_properties.retract.touch_tip.speed == 501 aspirate_properties.retract.delay.enabled = False @@ -140,7 +140,7 @@ def test_build_single_dispense_settings() -> None: } assert single_dispense_properties.retract.touch_tip.enabled is True assert single_dispense_properties.retract.touch_tip.z_offset == 2 - assert single_dispense_properties.retract.touch_tip.mm_to_edge == 1 + assert single_dispense_properties.retract.touch_tip.mm_from_edge == 1 assert single_dispense_properties.retract.touch_tip.speed == 50 assert single_dispense_properties.retract.blowout.enabled is True assert single_dispense_properties.retract.blowout.location is not None @@ -200,8 +200,8 @@ def test_single_dispense_settings_override() -> None: assert single_dispense_properties.retract.touch_tip.enabled is False single_dispense_properties.retract.touch_tip.z_offset = 2.34 assert single_dispense_properties.retract.touch_tip.z_offset == 2.34 - single_dispense_properties.retract.touch_tip.mm_to_edge = 1.11 - assert single_dispense_properties.retract.touch_tip.mm_to_edge == 1.11 + single_dispense_properties.retract.touch_tip.mm_from_edge = 1.11 + assert single_dispense_properties.retract.touch_tip.mm_from_edge == 1.11 single_dispense_properties.retract.touch_tip.speed = 543 assert single_dispense_properties.retract.touch_tip.speed == 543 single_dispense_properties.retract.blowout.enabled = False @@ -259,7 +259,7 @@ def test_build_multi_dispense_settings() -> None: } assert multi_dispense_properties.retract.touch_tip.enabled is True assert multi_dispense_properties.retract.touch_tip.z_offset == 2 - assert multi_dispense_properties.retract.touch_tip.mm_to_edge == 1 + assert multi_dispense_properties.retract.touch_tip.mm_from_edge == 1 assert multi_dispense_properties.retract.touch_tip.speed == 50 assert multi_dispense_properties.retract.blowout.enabled is False assert multi_dispense_properties.retract.blowout.location is None @@ -318,8 +318,8 @@ def test_multi_dispense_settings_override() -> None: assert multi_dispense_properties.retract.touch_tip.enabled is False multi_dispense_properties.retract.touch_tip.z_offset = 2.34 assert multi_dispense_properties.retract.touch_tip.z_offset == 2.34 - multi_dispense_properties.retract.touch_tip.mm_to_edge = 1.11 - assert multi_dispense_properties.retract.touch_tip.mm_to_edge == 1.11 + multi_dispense_properties.retract.touch_tip.mm_from_edge = 1.11 + assert multi_dispense_properties.retract.touch_tip.mm_from_edge == 1.11 multi_dispense_properties.retract.touch_tip.speed = 543 assert multi_dispense_properties.retract.touch_tip.speed == 543 multi_dispense_properties.retract.blowout.enabled = False diff --git a/api/tests/opentrons/protocol_engine/commands/test_touch_tip.py b/api/tests/opentrons/protocol_engine/commands/test_touch_tip.py index 5756810c9ee..9e2e0ac745a 100644 --- a/api/tests/opentrons/protocol_engine/commands/test_touch_tip.py +++ b/api/tests/opentrons/protocol_engine/commands/test_touch_tip.py @@ -150,7 +150,7 @@ async def test_touch_tip_implementation( ) -async def test_touch_tip_implementation_with_mm_to_edge( +async def test_touch_tip_implementation_with_mm_from_edge( decoy: Decoy, mock_state_view: StateView, mock_movement_handler: MovementHandler, diff --git a/shared-data/command/schemas/11.json b/shared-data/command/schemas/11.json index 6521c1cd0ee..2f7942a1e37 100644 --- a/shared-data/command/schemas/11.json +++ b/shared-data/command/schemas/11.json @@ -1923,7 +1923,7 @@ "LiquidClassTouchTipParams": { "description": "Parameters for touch-tip.", "properties": { - "mmToEdge": { + "mmFromEdge": { "anyOf": [ { "type": "integer" @@ -1933,7 +1933,7 @@ } ], "description": "Offset away from the the well edge, in millimeters.", - "title": "Mmtoedge" + "title": "Mmfromedge" }, "speed": { "anyOf": [ @@ -1962,7 +1962,7 @@ "title": "Zoffset" } }, - "required": ["zOffset", "mmToEdge", "speed"], + "required": ["zOffset", "mmFromEdge", "speed"], "title": "LiquidClassTouchTipParams", "type": "object" }, diff --git a/shared-data/js/types.ts b/shared-data/js/types.ts index 8fdcd8f9d39..0664688a1fd 100644 --- a/shared-data/js/types.ts +++ b/shared-data/js/types.ts @@ -718,7 +718,7 @@ interface DelayProperties { } interface TouchTipParams { zOffset: number - mmToEdge: number + mmFromEdge: number speed: number } interface TouchTipProperties { diff --git a/shared-data/liquid-class/definitions/1/ethanol_80.json b/shared-data/liquid-class/definitions/1/ethanol_80.json index 392d1454f8f..e58a9c9b890 100644 --- a/shared-data/liquid-class/definitions/1/ethanol_80.json +++ b/shared-data/liquid-class/definitions/1/ethanol_80.json @@ -42,7 +42,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -120,7 +120,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -194,7 +194,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -277,7 +277,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -355,7 +355,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -429,7 +429,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -512,7 +512,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -590,7 +590,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -669,7 +669,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -747,7 +747,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -825,7 +825,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -903,7 +903,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -981,7 +981,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1059,7 +1059,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1137,7 +1137,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1220,7 +1220,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1298,7 +1298,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1377,7 +1377,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1455,7 +1455,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1533,7 +1533,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1611,7 +1611,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1689,7 +1689,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1767,7 +1767,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1845,7 +1845,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1928,7 +1928,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2006,7 +2006,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2085,7 +2085,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2163,7 +2163,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2241,7 +2241,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2319,7 +2319,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2397,7 +2397,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2475,7 +2475,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2553,7 +2553,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, diff --git a/shared-data/liquid-class/definitions/1/glycerol_50.json b/shared-data/liquid-class/definitions/1/glycerol_50.json index 0cb8dad21b8..353140b16eb 100644 --- a/shared-data/liquid-class/definitions/1/glycerol_50.json +++ b/shared-data/liquid-class/definitions/1/glycerol_50.json @@ -38,7 +38,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -112,7 +112,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -187,7 +187,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -266,7 +266,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -340,7 +340,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -415,7 +415,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -494,7 +494,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -568,7 +568,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -642,7 +642,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -716,7 +716,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -790,7 +790,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -860,7 +860,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -934,7 +934,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1008,7 +1008,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1078,7 +1078,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1157,7 +1157,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1231,7 +1231,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1305,7 +1305,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1379,7 +1379,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1453,7 +1453,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1523,7 +1523,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1597,7 +1597,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1671,7 +1671,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1741,7 +1741,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1820,7 +1820,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1894,7 +1894,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1972,7 +1972,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2050,7 +2050,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2124,7 +2124,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2194,7 +2194,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2268,7 +2268,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2343,7 +2343,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2413,7 +2413,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, diff --git a/shared-data/liquid-class/definitions/1/water.json b/shared-data/liquid-class/definitions/1/water.json index d7bcd1afdc3..354bb470fbf 100644 --- a/shared-data/liquid-class/definitions/1/water.json +++ b/shared-data/liquid-class/definitions/1/water.json @@ -42,7 +42,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -116,7 +116,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -192,7 +192,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -269,7 +269,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -343,7 +343,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -419,7 +419,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -496,7 +496,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -570,7 +570,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -644,7 +644,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -720,7 +720,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -790,7 +790,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -860,7 +860,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -932,7 +932,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1002,7 +1002,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1072,7 +1072,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1149,7 +1149,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1223,7 +1223,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1297,7 +1297,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1373,7 +1373,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1443,7 +1443,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1513,7 +1513,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1585,7 +1585,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1655,7 +1655,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1725,7 +1725,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1802,7 +1802,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1872,7 +1872,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -1942,7 +1942,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2014,7 +2014,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2084,7 +2084,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2154,7 +2154,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2226,7 +2226,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2296,7 +2296,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, @@ -2366,7 +2366,7 @@ "enable": false, "params": { "zOffset": -1, - "mmToEdge": 0.5, + "mmFromEdge": 0.5, "speed": 30 } }, diff --git a/shared-data/liquid-class/fixtures/1/fixture_glycerol50.json b/shared-data/liquid-class/fixtures/1/fixture_glycerol50.json index 9c24a40452d..6f333ef44e1 100644 --- a/shared-data/liquid-class/fixtures/1/fixture_glycerol50.json +++ b/shared-data/liquid-class/fixtures/1/fixture_glycerol50.json @@ -41,7 +41,7 @@ "enable": true, "params": { "zOffset": 2, - "mmToEdge": 1, + "mmFromEdge": 1, "speed": 50 } }, @@ -117,7 +117,7 @@ "enable": true, "params": { "zOffset": 2, - "mmToEdge": 1, + "mmFromEdge": 1, "speed": 50 } }, @@ -192,7 +192,7 @@ "enable": true, "params": { "zOffset": 2, - "mmToEdge": 1, + "mmFromEdge": 1, "speed": 50 } }, diff --git a/shared-data/liquid-class/schemas/1.json b/shared-data/liquid-class/schemas/1.json index 633be549d4c..80142f7c6bb 100644 --- a/shared-data/liquid-class/schemas/1.json +++ b/shared-data/liquid-class/schemas/1.json @@ -73,7 +73,7 @@ "type": "number", "description": "Offset from the top of the well for touch-tip, in millimeters." }, - "mmToEdge": { + "mmFromEdge": { "type": "number", "description": "Offset away from the the well edge, in millimeters." }, @@ -82,7 +82,7 @@ "description": "Touch-tip speed, in millimeters per second." } }, - "required": ["zOffset", "mmToEdge", "speed"], + "required": ["zOffset", "mmFromEdge", "speed"], "additionalProperties": false } }, diff --git a/shared-data/python/opentrons_shared_data/liquid_classes/liquid_class_definition.py b/shared-data/python/opentrons_shared_data/liquid_classes/liquid_class_definition.py index aca371d43e6..d828bfbe4f5 100644 --- a/shared-data/python/opentrons_shared_data/liquid_classes/liquid_class_definition.py +++ b/shared-data/python/opentrons_shared_data/liquid_classes/liquid_class_definition.py @@ -100,7 +100,7 @@ class LiquidClassTouchTipParams(BaseModel): ..., description="Offset from the top of the well for touch-tip, in millimeters.", ) - mmToEdge: _Number = Field( + mmFromEdge: _Number = Field( ..., description="Offset away from the the well edge, in millimeters." ) speed: _NonNegativeNumber = Field(