Merge branch 'edge' into feat-api-change-plunger-acceleration-during-…

…aspirate-dispense
Opentrons · Jul 24, 2023 · e43d201 · e43d201
2 parents 29f2332 + 6267e73
commit e43d201
Show file tree

Hide file tree

Showing 117 changed files with 1,690 additions and 600 deletions.
diff --git a/.github/workflows/start-internal-release-ot2-build.yaml b/.github/workflows/start-internal-release-ot2-build.yaml
@@ -0,0 +1,59 @@
+name: 'Start Internal-Release OT-2 build'
+on:
+  push:
+    branches:
+      - edge
+      - '*internal-release*'
+    tags:
+      - ot3@*
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+
+jobs:
+  handle-push:
+    runs-on: 'ubuntu-latest'
+    if: github.event_name == 'push'
+    name: "Start an OT-2 build for a branch/tag push"
+    steps:
+      - name: 'start build'
+        uses: octokit/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.OT2_BUILD_CROSSREPO_ACCESS }}
+        with:
+          route: POST /repos/{owner}/{repo}/actions/workflows/{workflow-id}/dispatches
+          owner: opentrons
+          repo: buildroot
+          workflow-id: build.yml
+          ref: opentrons-develop
+          inputs: |
+            {
+              "buildroot-ref": "-",
+              "monorepo-ref": "${{ github.ref }}",
+              "infra-stage": "stage-prod"
+            }
+
+
+  handle-pr:
+    runs-on: 'ubuntu-latest'
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'Opentrons/opentrons' && contains(github.event.pull_request.labels.*.name, 'ot2-build')
+    name: "Start an OT-2 build for a requested PR"
+    steps:
+      - name: 'start build'
+        uses: octokit/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.OT2_BUILD_CROSSREPO_ACCESS }}
+        with:
+          route: POST /repos/{owner}/{repo}/actions/workflows/{workflow-id}/dispatches
+          owner: opentrons
+          repo: buildroot
+          workflow-id: build.yml
+          ref: opentrons-develop
+          inputs: |
+            {
+              "buildroot-ref": "-",
+              "monorepo-ref": "refs/heads/${{ github.head_ref }}",
+              "infra-stage": "stage-prod"
+            }
diff --git a/.github/workflows/start-ot3-build.yaml → ...ows/start-internal-release-ot3-build.yaml b/.github/workflows/start-ot3-build.yaml → ...ows/start-internal-release-ot3-build.yaml
@@ -1,13 +1,10 @@
-name: 'Start OT-3 build'
+name: 'Start Internal-Release OT-3 build'
 on:
   push:
     branches:
       - edge
-      - chore_bump-*
-      - chore_release-*
-      - release*
+      - '*internal-release*'
     tags:
-      - v*
       - ot3@*
   pull_request:
     types:

diff --git a/api-client/src/instruments/__fixtures__/index.ts b/api-client/src/instruments/__fixtures__/index.ts
@@ -22,6 +22,8 @@ export const instrumentsResponseFixture = {
         cursor: 0,
         totalLength: 1,
       },
+      ok: true,
+      subsystem: 'gripper',
     },
   ],
 }
diff --git a/api-client/src/instruments/types.ts b/api-client/src/instruments/types.ts
@@ -8,6 +8,7 @@ export interface GripperData {
       last_modified?: string
     }
   }
+  firmwareVersion?: string
   instrumentModel: string
   instrumentType: 'gripper'
   mount: string
@@ -26,6 +27,7 @@ export interface PipetteData {
       last_modified?: string
     }
   }
+  firmwareVersion?: string
   instrumentName: string
   instrumentModel: string
   instrumentType: 'pipette'

diff --git a/api/src/opentrons/config/defaults_ot3.py b/api/src/opentrons/config/defaults_ot3.py
@@ -81,16 +81,16 @@
 
 DEFAULT_MAX_SPEEDS: Final[ByGantryLoad[Dict[OT3AxisKind, float]]] = ByGantryLoad(
     high_throughput={
-        OT3AxisKind.X: 400,
-        OT3AxisKind.Y: 325,
+        OT3AxisKind.X: 350,
+        OT3AxisKind.Y: 300,
         OT3AxisKind.Z: 35,
         OT3AxisKind.P: 15,
         OT3AxisKind.Z_G: 50,
         OT3AxisKind.Q: 5.5,
     },
     low_throughput={
-        OT3AxisKind.X: 400,
-        OT3AxisKind.Y: 325,
+        OT3AxisKind.X: 350,
+        OT3AxisKind.Y: 300,
         OT3AxisKind.Z: 100,
         OT3AxisKind.P: 70,
         OT3AxisKind.Z_G: 50,
@@ -99,8 +99,8 @@
 
 DEFAULT_ACCELERATIONS: Final[ByGantryLoad[Dict[OT3AxisKind, float]]] = ByGantryLoad(
     high_throughput={
-        OT3AxisKind.X: 800,
-        OT3AxisKind.Y: 500,
+        OT3AxisKind.X: 700,
+        OT3AxisKind.Y: 600,
         OT3AxisKind.Z: 150,
         OT3AxisKind.P: 30,
         OT3AxisKind.Z_G: 150,
@@ -184,7 +184,7 @@
     },
     low_throughput={
         OT3AxisKind.X: 1.25,
-        OT3AxisKind.Y: 1.25,
+        OT3AxisKind.Y: 1.2,
         OT3AxisKind.Z: 1.0,
         # TODO: verify this value
         OT3AxisKind.P: 1.0,

diff --git a/app/src/App/OnDeviceDisplayApp.tsx b/app/src/App/OnDeviceDisplayApp.tsx
@@ -18,6 +18,7 @@ import { BackButton } from '../atoms/buttons'
 import { SleepScreen } from '../atoms/SleepScreen'
 import { ToasterOven } from '../organisms/ToasterOven'
 import { MaintenanceRunTakeover } from '../organisms/TakeoverModal'
+import { FirmwareUpdateTakeover } from '../organisms/FirmwareUpdateModal/FirmwareUpdateTakeover'
 import { ConnectViaEthernet } from '../pages/OnDeviceDisplay/ConnectViaEthernet'
 import { ConnectViaUSB } from '../pages/OnDeviceDisplay/ConnectViaUSB'
 import { ConnectViaWifi } from '../pages/OnDeviceDisplay/ConnectViaWifi'
@@ -253,6 +254,7 @@ export const OnDeviceDisplayApp = (): JSX.Element => {
     }
   }, [dispatch, isIdle, usersBrightness])
 
+  // TODO (sb:6/12/23) Create a notification manager to set up preference and order of takeover modals
   return (
     <ApiHostProvider hostname="localhost">
       <ErrorBoundary FallbackComponent={OnDeviceDisplayAppFallback}>
@@ -261,6 +263,7 @@ export const OnDeviceDisplayApp = (): JSX.Element => {
             <SleepScreen />
           ) : (
             <MaintenanceRunTakeover>
+              <FirmwareUpdateTakeover />
               <ToasterOven>
                 <ProtocolReceiptToasts />
                 <Switch>

diff --git a/app/src/assets/images/flex_gripper.png b/app/src/assets/images/flex_gripper.png