Merge branch 'edge' into app_odd-update-run-failed-modal

Opentrons · Jul 25, 2023 · acea1cf · acea1cf
2 parents 91614e8 + 76eece6
commit acea1cf
Show file tree

Hide file tree

Showing 362 changed files with 15,065 additions and 11,516 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/docs/static/override_sphinx.css b/api/docs/static/override_sphinx.css
@@ -168,7 +168,6 @@ ul {
 ul ul {
     list-style-type: circle;
     margin-left: 30px;
-    color: #999;
     font-family: "Open Sans", "sans-serif";
 }
 
@@ -197,3 +196,22 @@ table.docutils.field-list {
     margin-left: 0;
     padding-left: 30px;
 }
+
+/* Adjustments to Note and Warning admonitions */
+div.admonition {
+    padding-top: 20px;
+}
+
+div.admonition p.admonition-title {
+    font-size: 18px;
+}
+
+div.note {
+    background-color: #d9e9fe;
+    border: none;
+}
+
+div.warning {
+    background-color: #f7e0e0;
+    border: none;
+}
diff --git a/api/docs/v2/new_modules.rst b/api/docs/v2/new_modules.rst
@@ -37,7 +37,7 @@ When you load a module in a protocol, you inform the OT-2 that you want the spec
 
 .. versionadded:: 2.0
 
-.. _available_modules
+.. _available_modules:
 
 Available Modules
 -----------------

diff --git a/api/docs/v2/new_protocol_api.rst b/api/docs/v2/new_protocol_api.rst
@@ -42,26 +42,31 @@ Labware and Wells
 Modules
 -------
 
-.. autoclass:: opentrons.protocol_api.TemperatureModuleContext
+.. autoclass:: opentrons.protocol_api.HeaterShakerContext
    :members:
-   :exclude-members: start_set_temperature, await_temperature, broker, geometry, load_labware_object
+   :exclude-members: broker, geometry, load_labware_object
+   :inherited-members:
+
+.. autoclass:: opentrons.protocol_api.MagneticBlockContext
+   :members:
+   :exclude-members: broker, geometry, load_labware_object
    :inherited-members:
 
 .. autoclass:: opentrons.protocol_api.MagneticModuleContext
    :members:
    :exclude-members: calibrate, broker, geometry, load_labware_object
    :inherited-members:
 
+.. autoclass:: opentrons.protocol_api.TemperatureModuleContext
+   :members:
+   :exclude-members: start_set_temperature, await_temperature, broker, geometry, load_labware_object
+   :inherited-members:
+
 .. autoclass:: opentrons.protocol_api.ThermocyclerContext
    :members:
    :exclude-members: total_step_count, current_cycle_index, total_cycle_count, hold_time, ramp_rate, current_step_index, broker, geometry, load_labware_object
    :inherited-members:
 
-.. autoclass:: opentrons.protocol_api.HeaterShakerContext
-   :members:
-   :exclude-members: broker, geometry, load_labware_object
-   :inherited-members:
-
 
 .. _protocol-api-types:
 

diff --git a/api/release-notes-internal.md b/api/release-notes-internal.md
@@ -20,11 +20,13 @@ For more details about this release, please see the full [technical change log][
 - The ODD should prompt you to update your pipettes when you attach one that needs it (!)
 - The 96 shouldn't fall down when you attach it now (!)
 - More little stall detection fixes
+- The ODD will now display a spinner until the robot server has started
+- Homing now goes to the limit switch then backs off until the limit switch is released
+- Support for PVT (v3.5) pipettes
 
 ## Big Things That Don't Work Yet So Don't Report Bugs About Them
 
 ### ODD
-- The ODD doesn't really tell you if the robot server hasn't started yet; if a robot looks on but has the name "opentrons", or says it's not network-connected when you know it is, probably the server isn't up yet, give it another little bit
 - It can take a while for the robot to start after installing an update (it's the firmware updates happening on boot). Allow 10 minutes after an update that has a firmware change.
 
 ### Robot Control
@@ -33,14 +35,15 @@ For more details about this release, please see the full [technical change log][
 
 ## Big Things That Do Work Please Do Report Bugs About Them
 ### Robot Control
-- Liquid handling protocols with 1 and 8 channel pipettes
+- Protocol behavior
 - Labware movement between slots/modules, both manual and with gripper, from python protocols
 - Labware drop/gripper crash errors, but they're very insensitive
 - Pipette and gripper automated offset calibration
 - Network connectivity and discoverability
 - Firmware update for all devices 
 - Cancelling a protocol run. We're even more sure we fixed this so definitely tell us if it's not.
 - USB connectivity
+- Stall detection firing basically ever unless you clearly ran into something
 
 ### ODD
 - Protocol execution including end-of-protocol screen

diff --git a/api/src/opentrons/config/advanced_settings.py b/api/src/opentrons/config/advanced_settings.py
@@ -193,7 +193,10 @@ class Setting(NamedTuple):
     ),
 ]
 
-if ARCHITECTURE == SystemArchitecture.BUILDROOT:
+if (
+    ARCHITECTURE == SystemArchitecture.BUILDROOT
+    or ARCHITECTURE == SystemArchitecture.YOCTO
+):
     settings.append(DisableLogIntegrationSettingDefinition())
 
 

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,