Merge back 'chore_release-pd-8.5.0' into 'edge' (#18999)

ddcc4 · ddcc4 · commit 3e0312807b48 · 2025-07-22T15:49:17.000-04:00
diff --git a/.github/workflows/app-test-build-deploy.yaml b/.github/workflows/app-test-build-deploy.yaml
@@ -394,9 +394,23 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_ROBOTSTACK_SLACK_NOTIFICATION_WEBHOOK_URL }}
           _ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}}
 
+      - name: 'backup upload folders before checkout'
+        run: |
+          # Move upload folders to temp location to preserve them during checkout
+          mkdir -p ${{ runner.temp }}/upload_backup
+          mv to_upload_* ${{ runner.temp }}/upload_backup/ 2>/dev/null || true
       - name: 'pull repo for scripts'
         uses: 'actions/checkout@v4'
+      - name: 'restore upload folders after checkout'
+        run: |
+          # Restore upload folders from temp location
+          mv ${{ runner.temp }}/upload_backup/to_upload_* ./ 2>/dev/null || true
       - uses: ./.github/actions/js/setup
+      - name: 'print upload folders contents'
+        run: |
+          echo "Test Outputs"
+          echo "Contents of to_upload_internal-release: $(ls -l ./to_upload_internal-release)"
+          echo "Contents of to_upload_release: $(ls -l ./to_upload_release)"
       - name: 'update internal-releases releases.json'
         if: needs.determine-build-type.outputs.type == 'release' && contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
         run: |
diff --git a/api/release-notes.md b/api/release-notes.md
@@ -8,6 +8,15 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons Robot Software Changes in 8.5.1
+
+The 8.5.1 hotfix release fixes two bugs:
+
+- Corrected behavior when performing multi-dispense actions using a custom or modified liquid class.
+- Fixed a problem where certain quick transfers (specifically ones that attempt to blow out over the waste chute) could not be run.
+
+---
+
 ## Opentrons Robot Software Changes in 8.5.0
 
 Welcome to the v8.5.0 release of the Opentrons robot software! This release features the ability to pipette more accurately by using liquid classes in your protocols.
diff --git a/app-shell/build/release-notes.md b/app-shell/build/release-notes.md
@@ -8,6 +8,14 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons App Changes in 8.5.1
+
+Welcome to the v8.5.1 release of the Opentrons App!
+
+There are no changes to the Opentrons App in v8.5.1, but it is required for updating the robot software to improve some features.
+
+---
+
 ## Opentrons App Changes in 8.5.0
 
 Welcome to the v8.5.0 release of the Opentrons App! This release features the ability to run protocols that use liquid classes to improve pipetting accuracy.
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json
@@ -151,13 +151,13 @@
           "aspirate_mix_volume": "30",
           "aspirate_mmFromBottom": 1,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 125,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 125,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -190,13 +190,13 @@
           "dispense_mix_volume": null,
           "dispense_mmFromBottom": 0.5,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 125,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 125,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json
@@ -183,13 +183,13 @@
           "aspirate_mix_volume": null,
           "aspirate_mmFromBottom": 1,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 125,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 125,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -222,13 +222,13 @@
           "dispense_mix_volume": null,
           "dispense_mmFromBottom": 0.5,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 125,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 125,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
diff --git a/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json
@@ -205,13 +205,13 @@
           "aspirate_mix_volume": null,
           "aspirate_mmFromBottom": null,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 100,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 100,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -244,13 +244,13 @@
           "dispense_mix_volume": null,
           "dispense_mmFromBottom": null,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 100,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 100,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
@@ -437,13 +437,13 @@
           "aspirate_mix_volume": null,
           "aspirate_mmFromBottom": null,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 100,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 100,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -502,13 +502,13 @@
           "dispense_mix_volume": null,
           "dispense_mmFromBottom": null,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 100,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 100,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
diff --git a/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json b/protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json
@@ -122,13 +122,13 @@
           "aspirate_mix_volume": "2",
           "aspirate_mmFromBottom": 1,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 125,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 125,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -161,13 +161,13 @@
           "dispense_mix_volume": "3",
           "dispense_mmFromBottom": 2.5,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 125,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 125,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
diff --git a/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json b/protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json
@@ -64,13 +64,13 @@
           "aspirate_mix_volume": null,
           "aspirate_mmFromBottom": 29,
           "aspirate_position_reference": "well-bottom",
-          "aspirate_retract_delay_seconds": null,
+          "aspirate_retract_delay_seconds": 0,
           "aspirate_retract_mmFromBottom": 2,
           "aspirate_retract_speed": 100,
           "aspirate_retract_x_position": null,
           "aspirate_retract_y_position": null,
           "aspirate_retract_position_reference": "well-top",
-          "aspirate_submerge_delay_seconds": null,
+          "aspirate_submerge_delay_seconds": 0,
           "aspirate_submerge_speed": 100,
           "aspirate_submerge_mmFromBottom": 2,
           "aspirate_submerge_x_position": null,
@@ -103,13 +103,13 @@
           "dispense_mix_volume": null,
           "dispense_mmFromBottom": null,
           "dispense_position_reference": "well-bottom",
-          "dispense_retract_delay_seconds": null,
+          "dispense_retract_delay_seconds": 0,
           "dispense_retract_mmFromBottom": 2,
           "dispense_retract_speed": 100,
           "dispense_retract_x_position": null,
           "dispense_retract_y_position": null,
           "dispense_retract_position_reference": "well-top",
-          "dispense_submerge_delay_seconds": null,
+          "dispense_submerge_delay_seconds": 0,
           "dispense_submerge_speed": 100,
           "dispense_submerge_mmFromBottom": 2,
           "dispense_submerge_x_position": null,
diff --git a/protocol-designer/src/assets/localization/en/onboarding.json b/protocol-designer/src/assets/localization/en/onboarding.json
@@ -9,9 +9,8 @@
   "add_your_pipettes": "Add your pipettes",
   "are_you_sure_clear_slot": "Are you sure you want to clear slot?",
   "are_you_sure_reconfigure_slot": "Are you sure you want to reconfigure the slot?",
-  "are_you_using_gripper": "Are you using a Waste chute in your protocol?",
   "are_you_using_thermocycler": "Are you using a Thermocycler in your protocol?",
-  "are_you_using_waste_chute": "Are you using a Waste chute in your protocol?",
+  "are_you_using_waste_chute": "Are you using a waste chute in your protocol?",
   "author_org": "Author/Organization",
   "basics": "Let’s start with the basics",
   "clear_slot": "Clear slot",
diff --git a/protocol-designer/src/constants.ts b/protocol-designer/src/constants.ts
@@ -108,6 +108,9 @@ export const OT2_Y_MAX_SPEED = 400
 export const OT2_Z_MAX_SPEED = 125
 export const OT2_PLUNGER_MAX_SPEED = 40
 
+// pulled from documentation
+export const DEFAULT_TOUCH_TIP_SPEED = 60
+
 export const CHANNELS_MAPPED_TO_MAX_SPEED: Record<
   RobotType,
   Record<number, { plunger: number; x: number; y: number; z: number }>
diff --git a/protocol-designer/src/file-data/__tests__/createFile.test.ts b/protocol-designer/src/file-data/__tests__/createFile.test.ts
@@ -175,7 +175,9 @@ def run(protocol: protocol_api.ProtocolContext) -> None:
     )
 
     # Load Pipettes:
-    mock_python_name_1 = protocol.load_instrument("p10_single", "left", tip_racks=[mock_python_name_2])
+    mock_python_name_1 = protocol.load_instrument(
+        "p10_single", "left", tip_racks=[mock_python_name_2],
+    )
 
     # PROTOCOL STEPS
 
diff --git a/protocol-designer/src/load-file/migration/8_5_0.ts b/protocol-designer/src/load-file/migration/8_5_0.ts
@@ -218,12 +218,12 @@ export const migrateFile = (
                     matchingDispenseLabwareWellDepth,
                   1
                 ),
-          aspirate_retract_delay_seconds: null,
-          dispense_retract_delay_seconds: null,
+          aspirate_retract_delay_seconds: 0,
+          dispense_retract_delay_seconds: 0,
           aspirate_retract_speed: maxZSpeed,
           dispense_retract_speed: maxZSpeed,
-          aspirate_submerge_delay_seconds: null,
-          dispense_submerge_delay_seconds: null,
+          aspirate_submerge_delay_seconds: 0,
+          dispense_submerge_delay_seconds: 0,
           aspirate_submerge_speed: maxZSpeed,
           dispense_submerge_speed: maxZSpeed,
           aspirate_touchTip_speed: maxXYSpeed,
diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/FlowRateField.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/FlowRateField.tsx
@@ -7,6 +7,7 @@ import {
   getAllLiquidClassDefs,
   getFlexNameConversion,
   linearInterpolate,
+  OT2_ROBOT_TYPE,
   WATER_LIQUID_CLASS_NAME,
 } from '@opentrons/shared-data'
 import { getTransferPlanAndReferenceVolumes } from '@opentrons/step-generation'
@@ -91,6 +92,9 @@ export function FlowRateField(props: FlowRateFieldProps): JSX.Element {
               .airGapByVolume as Array<[number, number]>) ?? []
     }
   }
+
+  const isOT2 = robotType === OT2_ROBOT_TYPE
+
   // if form type is 'mix', we will use single path
   const referenceVolumesForByVolumeInterpolation =
     pipette != null && tiprackDef != null && formData != null
@@ -103,13 +107,15 @@ export function FlowRateField(props: FlowRateFieldProps): JSX.Element {
               : 1,
           pipetteSpecs: pipette?.spec,
           tiprackDefinition: tiprackDef,
-          conditioningByVolume:
-            (liquidClassValuesForTip?.multiDispense
-              ?.conditioningByVolume as Array<[number, number]>) ?? null,
-          disposalByVolume:
-            (liquidClassValuesForTip?.multiDispense?.disposalByVolume as Array<
-              [number, number]
-            >) ?? null,
+          // multi-dispense is valid on OT-2, even though liquid class values are null
+          conditioningByVolume: isOT2
+            ? []
+            : (liquidClassValuesForTip?.multiDispense
+                ?.conditioningByVolume as Array<[number, number]>) ?? null,
+          disposalByVolume: isOT2
+            ? []
+            : (liquidClassValuesForTip?.multiDispense
+                ?.disposalByVolume as Array<[number, number]>) ?? null,
           aspirateAirGapByVolume: airGapByVolume,
         }).referenceVolumes
       : null
diff --git a/protocol-designer/src/pages/Onboarding/__tests__/SelectBasics.test.tsx b/protocol-designer/src/pages/Onboarding/__tests__/SelectBasics.test.tsx
@@ -118,7 +118,7 @@ describe('SelectBasics', () => {
     expect(props.setValue).toHaveBeenCalled()
 
     // wasteChute
-    screen.getByText('Are you using a Waste chute in your protocol?')
+    screen.getByText('Are you using a waste chute in your protocol?')
     fireEvent.click(screen.getAllByRole('label', { name: 'Yes' })[2])
     expect(props.setValue).toHaveBeenCalled()
     fireEvent.click(screen.getAllByRole('label', { name: 'No' })[2])
diff --git a/protocol-designer/src/step-forms/test/createPresavedStepForm.test.ts b/protocol-designer/src/step-forms/test/createPresavedStepForm.test.ts
@@ -164,7 +164,7 @@ describe('createPresavedStepForm', () => {
       aspirate_mmFromBottom: null,
       aspirate_position_reference: 'well-bottom',
       aspirate_retract_position_reference: 'well-top',
-      aspirate_retract_delay_seconds: null,
+      aspirate_retract_delay_seconds: 0,
       aspirate_retract_mmFromBottom: null,
       aspirate_retract_speed: null,
       aspirate_retract_x_position: 0,
@@ -174,12 +174,12 @@ describe('createPresavedStepForm', () => {
       aspirate_submerge_x_position: 0,
       aspirate_submerge_y_position: 0,
 
-      aspirate_submerge_delay_seconds: null,
+      aspirate_submerge_delay_seconds: 0,
       aspirate_submerge_speed: null,
       aspirate_touchTip_checkbox: false,
-      aspirate_touchTip_mmFromEdge: null,
+      aspirate_touchTip_mmFromEdge: 0,
       aspirate_touchTip_mmFromTop: null,
-      aspirate_touchTip_speed: null,
+      aspirate_touchTip_speed: 60,
       aspirate_wellOrder_first: 't2b',
       aspirate_wellOrder_second: 'l2r',
       aspirate_wells: [],
@@ -196,7 +196,7 @@ describe('createPresavedStepForm', () => {
       dispense_mix_volume: null,
       dispense_mmFromBottom: null,
       dispense_position_reference: 'well-bottom',
-      dispense_retract_delay_seconds: null,
+      dispense_retract_delay_seconds: 0,
       dispense_retract_position_reference: 'well-top',
       dispense_retract_mmFromBottom: null,
       dispense_retract_speed: null,
@@ -206,12 +206,12 @@ describe('createPresavedStepForm', () => {
       dispense_submerge_mmFromBottom: null,
       dispense_submerge_x_position: 0,
       dispense_submerge_y_position: 0,
-      dispense_submerge_delay_seconds: null,
+      dispense_submerge_delay_seconds: 0,
       dispense_submerge_speed: null,
       dispense_touchTip_checkbox: false,
-      dispense_touchTip_mmFromEdge: null,
+      dispense_touchTip_mmFromEdge: 0,
       dispense_touchTip_mmFromTop: null,
-      dispense_touchTip_speed: null,
+      dispense_touchTip_speed: 60,
       dispense_wellOrder_first: 't2b',
       dispense_wellOrder_second: 'l2r',
       dispense_wells: [],
diff --git a/protocol-designer/src/steplist/formLevel/errors.ts b/protocol-designer/src/steplist/formLevel/errors.ts
diff --git a/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.ts b/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.ts
diff --git a/protocol-designer/src/steplist/formLevel/handleFormChange/utils.ts b/protocol-designer/src/steplist/formLevel/handleFormChange/utils.ts
diff --git a/protocol-designer/src/steplist/formLevel/test/getDefaultsForStepType.test.ts b/protocol-designer/src/steplist/formLevel/test/getDefaultsForStepType.test.ts
diff --git a/step-generation/src/__tests__/distribute.test.ts b/step-generation/src/__tests__/distribute.test.ts
diff --git a/step-generation/src/__tests__/pythonFileUtils.test.ts b/step-generation/src/__tests__/pythonFileUtils.test.ts
diff --git a/step-generation/src/utils/pythonFileUtils.ts b/step-generation/src/utils/pythonFileUtils.ts
