Merge back branch 'chore_release-8.5.0' into 'chore_release-pd-8.5.0'

Author: ddcc4

.github/workflows/app-test-build-deploy.yaml

@@ -221,6 +221,32 @@ jobs:
         run: |
           make -C app dist
 
+      - name: Install and Invoke TrustedSigning @0.5.3 on dummy executable
+        # Work around from https://github.com/electron-userland/electron-builder/issues/9076#issuecomment-2855541018
+        if: startsWith(matrix.os, 'windows') && contains(needs.determine-build-type.outputs.type, 'release')
+        shell: pwsh
+        run: |
+            Install-Module -Name TrustedSigning -RequiredVersion 0.5.3 -Force -Repository PSGallery
+            # Create a dummy executable file
+            $dummyExePath = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "dummy.exe"
+            Set-Content -Path $dummyExePath -Value "This is a dummy executable for testing purposes."
+            # Invoke Trusted Signing on the dummy executable
+            # Necessary to force dependency resolution
+            try {
+              Invoke-TrustedSigning `
+                -Endpoint 'https://eus.codesigning.azure.net/' `
+                -CertificateProfileName 'dummyName' `
+                -CodeSigningAccountName 'dummyName' `
+                -TimestampRfc3161 'http://timestamp.acs.microsoft.com' `
+                -TimestampDigest 'SHA256' `
+                -FileDigest 'SHA256' `
+                -Files $dummyExePath
+            } catch {
+              Write-Host "Invoke-TrustedSigning failed: $($_.Exception.Message)"
+              # Prevent the script from exiting with a non-zero status
+              exit 0
+            }
+
       # build the desktop app and deploy it
       - name: 'build ${{matrix.variant}} app for ${{ matrix.os }}'
         if: matrix.target == 'desktop'

api/release-notes.md

@@ -8,6 +8,12 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons Robot Software Changes in 8.4.1
+
+There are no changes to the robot software in v8.4.1, but it is required for running protocols in v8.4.1 of the Opentrons App.
+
+---
+
 ## Opentrons Robot Software Changes in 8.4.0
 
 Welcome to the v8.4.0 release of the Opentrons robot software! This release includes updated liquid handling commands for pipetting relative to a liquid meniscus, and other new features, improvements, and bug fixes.

api/src/opentrons/hardware_control/backends/flex_protocol.py

@@ -44,6 +44,7 @@
 from ..dev_types import OT3AttachedInstruments
 from .types import HWStopCondition
 
+
 Cls = TypeVar("Cls")
 
 
@@ -476,3 +477,27 @@ async def get_hepa_uv_state(self) -> Optional[HepaUVState]:
     async def increase_evo_disp_count(self, mount: OT3Mount) -> None:
         """Tell a pipette to increase it's evo-tip-dispense-count in eeprom."""
         ...
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...

api/src/opentrons/hardware_control/backends/ot3controller.py

@@ -219,7 +219,13 @@
 from .types import HWStopCondition
 from .flex_protocol import FlexBackend
 from .status_bar_state import StatusBarStateController
-from opentrons_hardware.sensors.types import SensorDataType
+from opentrons_hardware.sensors.sensor_types import (
+    EnvironmentSensor,
+    CapacitiveSensor,
+    PressureSensor,
+)
+from opentrons_hardware.sensors.types import SensorDataType, EnvironmentSensorDataType
+from opentrons_hardware.sensors.sensor_driver import SensorDriver
 from opentrons_hardware.sensors.utils import send_evo_dispense_count_increase
 
 from .. import modules
@@ -1864,3 +1870,72 @@ async def increase_evo_disp_count(self, mount: OT3Mount) -> None:
         await send_evo_dispense_count_increase(
             self._messenger, sensor_node_for_pipette(OT3Mount(mount.value))
         )
+
+    async def _read_env_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[EnvironmentSensorDataType]:
+        """Read and return the current sensor information."""
+        sensor = EnvironmentSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, EnvironmentSensorDataType)
+        return sensor_data
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        s_data = await self._read_env_sensor(mount, primary)
+        if s_data is None or s_data.temperature is None:
+            return None
+        return s_data.temperature.to_float()
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        s_data = await self._read_env_sensor(mount, primary)
+        if s_data is None or s_data.humidity is None:
+            return None
+        return s_data.humidity.to_float()
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        sensor = PressureSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, SensorDataType)
+        return sensor_data.to_float() if sensor_data else None
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        sensor = CapacitiveSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, SensorDataType)
+        return sensor_data.to_float() if sensor_data else None

api/src/opentrons/hardware_control/backends/ot3simulator.py

@@ -67,6 +67,7 @@
     FlexBackend,
 )
 
+
 log = logging.getLogger(__name__)
 
 AXIS_TO_SUBSYSTEM = {
@@ -877,3 +878,29 @@ def _update_tip_state(self, mount: OT3Mount, status: bool) -> None:
 
     async def increase_evo_disp_count(self, mount: OT3Mount) -> None:
         pass
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+
+        return 0.0
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+
+        return 0.0
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        return 0.0
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        return 0.0

api/src/opentrons/hardware_control/ot3api.py

@@ -3165,3 +3165,35 @@ async def increase_evo_disp_count(
         """Tell a pipette to increase its evo-tip-dispense-count in eeprom."""
         realmount = OT3Mount.from_mount(mount)
         await self._backend.increase_evo_disp_count(realmount)
+
+    async def read_stem_temperature(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current stem temperature."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_env_temp_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_humidity(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem humidity."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_env_hum_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_pressure(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem pressure."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_pressure_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_capacitance(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem capacitance."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_capacitive_sensor(realmount, primary)
+        return s_data if s_data else 0.0

app-shell/build/release-notes.md

@@ -8,6 +8,15 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons App Changes in 8.4.1
+
+The 8.4.1 hotfix release fixes two issues:
+
+- Placing a Magnetic Block in slot C2 no longer prevents Labware Position Check from running.
+- Existing labware offsets are no longer doubled during Labware Position Check.
+
+---
+
 ## Opentrons App Changes in 8.4.0
 
 Welcome to the v8.4.0 release of the Opentrons App! This release includes updates to labware offsets on the Flex, as well as other new features, improvements, and bug fixes.
@@ -45,6 +54,8 @@ There are no changes to the Opentrons App in v8.3.2, but it is required for upda
 
 The 8.3.1 hotfix release includes a small fix to allow all robots to properly reboot after an upgrade to v8.3.0.
 
+---
+
 ## Opentrons App Changes in 8.3.0
 
 Welcome to the v8.3.0 release of the Opentrons App! This release adds support for Mandarin in the app or Flex touchscreen and includes other beta features for our commercial partners.