Merge back 'chore_release-pd-8.7.0' into 'edge'

Resolved conflicts:
- step-generation/src/constants.ts

Author: ddcc4

api/docs/v2/liquid_classes.rst

@@ -235,9 +235,9 @@ Next, edit individual liquid class properties based on your Flex pipette and tip
 
 .. code-block:: python
     
-  # edit aspirate submerge speed to 80 μL/sec
+  # edit aspirate submerge speed to 80 µL/sec
     custom_water_properties.aspirate.submerge.speed = 80
-  # edit aspirate flow rate by volume for 10 μL and 20 μL volumes
+  # edit aspirate flow rate by volume for 10 µL and 20 µL volumes
     custom_water_properties.aspirate.flow_rate_by_volume.set_for_volume(volume=10.0, value=40.0)
     custom_water_properties.aspirate.flow_rate_by_volume.set_for_volume(volume=20.0, value=30.0)
   # edit to delay for 1 sec before retracting after an aspirate

api/docs/v2/versioning.rst

@@ -170,7 +170,7 @@ Version 2.25
 -------------
 
 - Adds :py:class:`.FlexStackerContext` to support the :ref:`Flex Stacker Module <stacker>`. Use the load name ``flexStackerModuleV1`` with :py:meth:`.ProtocolContext.load_module` to add a Flex Stacker and automate labware storage in a protocol.
-- Use the load name ``flex_96channel_200`` with :py:meth:`.load_instrument` to add the Opentrons Flex 96-Channel Pipette (1–200 μL) to a protocol. Note that this pipette does not work with liquid class commands in this API version. 
+- Use the load name ``flex_96channel_200`` with :py:meth:`.load_instrument` to add the Opentrons Flex 96-Channel Pipette (1–200 µL) to a protocol. Note that this pipette does not work with liquid class commands in this API version. 
 
 Version 2.24
 -------------

api/release-notes.md

@@ -31,7 +31,7 @@ Use Opentrons Tough Universal Lids on compatible well plates and reservoirs.
 
 ### Improvements
 
-Transfer aqueous, viscous, or volatile liquids with the Opentrons Flex 96-Channel Pipette (1–200 μL) to apply optimized, liquid class transfer behavior to volumes as low as 1 µL.
+Transfer aqueous, viscous, or volatile liquids with the Opentrons Flex 96-Channel Pipette (1–200 µL) to apply optimized, liquid class transfer behavior to volumes as low as 1 µL.
 
 ### Bug Fixes
 
@@ -45,12 +45,12 @@ Welcome to the v8.6.0 release of the Opentrons robot software! This release adds
 ### New Features
 
 - Automate labware storage with the Flex Stacker Module. Use new commands like `retrieve()` and `store()` to move well plates, reservoirs, or Flex tip racks to and from the Stacker during a protocol.
-- This release adds support for the Opentrons Flex 96-Channel Pipette (1–200 μL) to transfer as little as 1 µL in a protocol.
+- This release adds support for the Opentrons Flex 96-Channel Pipette (1–200 µL) to transfer as little as 1 µL in a protocol.
 - Control individual robot motors, like the gantry, extension mount, or gripper, with new commands.
 
 ### Known Limitations
 
-- The Opentrons Flex 96-Channel Pipette (1–200 μL) does not yet support liquid classes. Use legacy liquid-handling commands from the Python Protocol API.
+- The Opentrons Flex 96-Channel Pipette (1–200 µL) does not yet support liquid classes. Use legacy liquid-handling commands from the Python Protocol API.
 - The Flex Gripper can't currently sense if it has failed to pick up a labware lid.
 - Certain partial tip pickup actions adjacent to a Flex Stacker raise an error, even though no collision would occur.
 - Certain robot motor control commands don't appear properly in the run log. The commands are still functional.

api/src/opentrons/system/camera.py

@@ -158,7 +158,7 @@ async def update_live_stream_status(
         and camera_enable_settings.liveStreamEnabled
     ):
         # Check to see if the camera device is available
-        raw_device = str(contents["SOURCE"])[1:-1]
+        raw_device = str(contents["SOURCE"])
         if not os.path.exists(raw_device):
             log.error(
                 f"Opentrons Live Stream cannot sample the camera. No video device found with device path: {raw_device}"

app-shell/build/release-notes.md

@@ -24,6 +24,11 @@ Welcome to the v8.8.0 release of the Opentrons App! This release includes concur
 - An attached pipette no longer descends to attach a calibration probe for Labware Position Check, creating more clearance on the deck.
 - Changed runtime parameters no longer revert to their default values.
 
+### Known Issues
+
+- Error recovery in the app or on the Flex touchscreen can't successfully resolve overpressure errors that occur while pipetting relative to the liquid meniscus. We recommend canceling the protocol when these errors occur.
+- Images captured in a protocol are not available during the run via USB. Use a different connection type (Wi-Fi or Ethernet), view the images on the touchscreen, or download the images after the run is complete.
+
 ---
 
 ## Opentrons App Changes in 8.7.0

app/src/assets/localization/zh/protocol_setup.json

@@ -92,10 +92,12 @@
   "deck_hardware": "甲板硬件",
   "deck_map": "甲板布局图",
   "default_values": "默认值",
+  "disabled": "禁用",
   "download_files": "下载文件",
   "enable_camera": "启用摄像头以继续操作",
   "enable_camera_to_proceed": "启用摄像头以继续",
   "enabled": "已启用",
+  "error_confirming_camera": "确认摄像头偏好设置时出错",
   "example": "示例",
   "exit_to_deck_configuration": "退出到甲板配置",
   "extension_mount": "扩展安装支架",

app/src/organisms/ErrorRecoveryFlows/utils/getErrorKind.ts

@@ -26,11 +26,13 @@ export function getErrorKind(
           case 'prepareToAspirate':
             return ERROR_KINDS.OVERPRESSURE_PREPARE_TO_ASPIRATE
           case 'aspirate':
-          case 'aspirateInPlace': {
+          case 'aspirateInPlace':
+          case 'aspirateWhileTracking': {
             return ERROR_KINDS.OVERPRESSURE_WHILE_ASPIRATING
           }
           case 'dispense':
           case 'dispenseInPlace':
+          case 'dispenseWhileTracking':
           case 'blowout':
           case 'blowOutInPlace':
             return ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING

components/src/molecules/WizardHeader/index.tsx

@@ -1,4 +1,5 @@
-import { LegacyStyledText, StepMeter, StyledText } from '../../atoms'
+import { StepMeter, StyledText } from '../../atoms'
+import { grey60 } from '../../helix-design-system/colors'
 import { Box, Btn, Flex } from '../../primitives'
 import { ALIGN_CENTER, DIRECTION_ROW } from '../../styles'
 import { SPACING } from '../../ui-style-constants'
@@ -45,16 +46,28 @@ export const WizardHeader = (props: WizardHeaderProps): JSX.Element => {
           currentStep != null &&
           totalSteps != null &&
           currentStep > 0 ? (
-            <LegacyStyledText className={styles.step_text}>
+            <StyledText
+              desktopStyle="bodyDefaultRegular"
+              oddStyle="bodyTextSemiBold"
+              color={grey60}
+            >
               {`Step ${currentStep} / ${totalSteps}`}
-            </LegacyStyledText>
+            </StyledText>
           ) : null}
         </Flex>
         {onExit != null ? (
-          <Btn onClick={onExit} aria-label="Exit" disabled={exitDisabled}>
-            <LegacyStyledText className={styles.exit_button}>
+          <Btn
+            onClick={onExit}
+            aria-label="Exit"
+            disabled={exitDisabled}
+            className={styles.exit_button}
+          >
+            <StyledText
+              desktopStyle="bodyDefaultSemiBold"
+              oddStyle="bodyTextSemiBold"
+            >
               {exitButtonCopy ?? 'Exit'}
-            </LegacyStyledText>
+            </StyledText>
           </Btn>
         ) : null}
       </Flex>

docs/flex/docs/labware/concepts.md

@@ -22,7 +22,7 @@ Custom labware is labware that is not included in the Labware Library or was cre
 
 Let's take a moment to unpack the concept of custom labware. 
 
-As an example, the Opentrons Labware Library includes 96-well plates (200 µL) from Corning and Bio-Rad, but other manufacturers make these well plates too. And, thanks to commonly accepted industry standards, the differences among these ubiquitous lab items are minor. However, an ordinary 200 μL, 96-well plate from Stellar Scientific, Oxford Lab, or Krackeler Scientific (or any other supplier for that matter) is "custom labware" for the Flex because it isn't pre-defined in our Labware Library. Additionally, minor differences in labware dimensions can have a drastic impact on the success of your protocol run. For this reason, it's important to have an accurate labware definition for each labware you want to use in your protocol. 
+As an example, the Opentrons Labware Library includes 96-well plates (200 µL) from Corning and Bio-Rad, but other manufacturers make these well plates too. And, thanks to commonly accepted industry standards, the differences among these ubiquitous lab items are minor. However, an ordinary 200 µL, 96-well plate from Stellar Scientific, Oxford Lab, or Krackeler Scientific (or any other supplier for that matter) is "custom labware" for the Flex because it isn't pre-defined in our Labware Library. Additionally, minor differences in labware dimensions can have a drastic impact on the success of your protocol run. For this reason, it's important to have an accurate labware definition for each labware you want to use in your protocol. 
 
 Also, while custom labware could be an esoteric, one-off piece of kit, most of the time it's just the tips, plates, tubes, and racks used every day in labs all over the world. Again, the only difference between Opentrons labware and custom labware is that the custom labware is not predefined in the software that powers the robot. The Flex can, and does, work with other basic labware items or something unique, but you need to record that item's characteristics in a labware definition JSON file and import that data into the Opentrons App. See the [Labware Definitions section](definitions.md) for more information. 
 

docs/flex/docs/labware/types.md

@@ -87,7 +87,7 @@ Flex pipettes only accept tips with capacities less than or equal to the pipette
 | Pipette capacity | Compatible tips             |
 | :--------------- | :-------------------------- |
 | 1–50 µL          | 50 µL tips only             |
-| 5–1000 µL        | 50 μL, 200 μL, and 1000 µL tips |
+| 5–1000 µL        | 50 µL, 200 µL, and 1000 µL tips |
 
 For best performance, use the smallest tips that can hold the amount of liquid you need to aspirate. See [Pipette specifications][pipette-specifications] for examples.