Skip to content

Conversation

@ddcc4
Copy link
Collaborator

@ddcc4 ddcc4 commented Nov 13, 2025

@jerader Your change to delete QT JSON generation created a bit of a merge conflict, but it should be fine now :)

@rclarke0 I had to edit your CameraCard.tsx after @mjhuff's PR #20089 renamed photo-camera -> camera.

ryanthecoder and others added 16 commits November 10, 2025 13:36
# Overview
new motion planning from dynamic pipetting can trigger a zero move
length error in a new spot so that call needs to be added into the
try/except portion.
… endpoints (#20100)

Covers RQA-4839
Ensures that the camera device is always validated to exist first before any action is taken regarding any camera behavior anywhere.
#20100 ensures that configuring a camera usage setting 503s if the
camera is disconnected, but the default state is to render the camera as
`enabled` if we can't GET the camera usage settings. We should do the
exact opposite of that.
The old opentrons deploy actions would build the distributables as well
as deploy them; now that we're using the pypi-maintained deploy actions,
we need to build them explicitly (we can't use the ones we already built
because that happened in a different job aka vm).
# Overview

The JavaScript console for the ODD was filling up with log messages of:
```
[app//opt/opentrons-app/resources/app.asar/ui/assets/index-XXX.js] debug: Received action from main via IPC
--------------------------------------------------
▶ Object
```
which is not very helpful.

This PR is a small tweak to inline the action into the log message so
that you can see it without clicking on `▶ Object`, decluttering the
console.

#### Before:
<img width="1176" height="586" alt="image" src="https://github.com/user-attachments/assets/fb503f36-337a-4031-a026-2067db8df67f"/>

#### After:
<img width="1166" height="432" alt="image" src="https://github.com/user-attachments/assets/ec79376f-c692-4b1f-a9b4-b7bfcb7c7fab"/>

## Test Plan and Hands on Testing

Built the ODD and deployed it to AuthorshipPVT for hands-on testing.

## Risk assessment

Low.
# Overview

Specify Camera type based on robot type on peripherals card

## Test Plan and Hands on Testing

Smoke tested
<img width="390" height="172" alt="Screenshot 2025-11-10 at 11 54 37 AM"
src="https://github.com/user-attachments/assets/8b4368b2-7776-402c-8e68-38b8557e339b"
/>
<img width="341" height="166" alt="Screenshot 2025-11-10 at 11 55 18 AM"
src="https://github.com/user-attachments/assets/8b09ed20-0d1d-42cd-bee1-a415b14005c2"
/>

## Changelog

Conditionally displays camera type based on robot, added in camera icon


## Risk assessment

low

closes EXEC-2040
…20122)

# Overview
Plunger moves in the negative direction were broken because the unit
vector is negative and the plan motion function expects speed to always
be positive.
…20107)

Covers RQA-4842
Ensures we execute error image capture even if the original exception that prompted image capture gets interrupted by another exception.
The old opentrons deploy actions would build the distributables as well
as deploy them; now that we're using the pypi-maintained deploy actions,
we need to build them explicitly (we can't use the ones we already built
because that happened in a different job aka vm).

## Testing
Unfortunately there's not much we can do here, but this is already
broken and this is pretty straightforward.
Covers RQA-4848

Enforce that calls to the capture_image command must provide filter params with percentage values
Covers RQA-4852
Spacebars are once again allowed in image file names
…ure (#20126)

# Overview

Copy changes to livestream window to include robot name and changed
error image capture header

## Test Plan and Hands on Testing

smoke tested on app and odd
<img width="919" height="674" alt="Screenshot 2025-11-13 at 9 58 24 AM"
src="https://github.com/user-attachments/assets/76a4eeb7-d84d-493d-ae9c-4b40a4ad4ab5"
/>

<img width="968" height="417" alt="Screenshot 2025-11-12 at 1 42 14 PM"
src="https://github.com/user-attachments/assets/d40eeefa-b638-4803-96a7-119f9488f728"
/>

<img width="496" height="436" alt="Screenshot 2025-11-12 at 1 46 03 PM"
src="https://github.com/user-attachments/assets/2ecd2f03-9221-4a05-b801-9f6f0a77c29b"
/>

## Risk assessment

low

Closes EXEC-2051
Closes EXEC-2052
Closes RQA-4850
# Overview

Previously, the `Labware.set_offset()` function claimed that
```
The offset is an x, y, z vector in deck coordinates (see :ref:`protocol-api-deck-coords`).
```
This is misleading because a deck coordinate of `(0, 0, 0)` means the
front left corner of the deck, but `set_offset(0, 0, 0)` would **not**
put the labware on the front left corner of the deck.

Then there's also the `Labware.calibrated_offset` property, which
**does** return deck coordinates, but is not documented as doing so.

This PR swaps the deck coordinates comment from `Labware.set_offset()`
to `Labware.calibrated_offset`.

## Test Plan and Hands on Testing

No change to functionality at all, just a docstring change.

## Risk assessment

Low.
@ddcc4 ddcc4 requested a review from a team as a code owner November 13, 2025 16:32
ddcc4 added a commit that referenced this pull request Nov 13, 2025
Resolved conflicts:
- app/src/organisms/ODD/QuickTransferFlow/utils/createQuickTransferFile.ts
@ddcc4 ddcc4 force-pushed the merge-880-into-edge branch from 422de6d to caf1a07 Compare November 13, 2025 16:32
@codecov
Copy link

codecov bot commented Nov 13, 2025

Codecov Report

❌ Patch coverage is 0% with 55 lines in your changes missing coverage. Please review.
✅ Project coverage is 25.88%. Comparing base (995d418) to head (820fab0).
⚠️ Report is 17 commits behind head on edge.

Files with missing lines Patch % Lines
...s/RobotSettingsCamera/RobotSettingsCameraUsage.tsx 0.00% 21 Missing ⚠️
...ganisms/Desktop/Devices/Peripherals/CameraCard.tsx 0.00% 13 Missing ⚠️
...ProtocolRun/SetupCamera/SetupRunCameraSettings.tsx 0.00% 11 Missing ⚠️
...l-resources/images/hooks/useCameraUsageSettings.ts 0.00% 4 Missing ⚠️
...tocolRun/ProtocolRunCamera/LaunchLivestreamBtn.tsx 0.00% 3 Missing ⚠️
.../Desktop/Devices/ProtocolRun/SetupCamera/index.tsx 0.00% 1 Missing ⚠️
...evices/RobotSettings/RobotSettingsCamera/index.tsx 0.00% 1 Missing ⚠️
app/src/redux/shell/epic.ts 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #20140      +/-   ##
==========================================
+ Coverage   24.29%   25.88%   +1.59%     
==========================================
  Files        3565     3565              
  Lines      297380   297402      +22     
  Branches    42131    42046      -85     
==========================================
+ Hits        72247    76995    +4748     
+ Misses     225111   220388    -4723     
+ Partials       22       19       -3     
Flag Coverage Δ
protocol-designer 19.13% <0.00%> (-0.01%) ⬇️
step-generation 5.48% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...e/hardware_control/motion_planning/move_manager.py 89.58% <ø> (ø)
shared-data/protocol/types/schemaV8/index.ts 100.00% <ø> (ø)
.../Desktop/Devices/ProtocolRun/SetupCamera/index.tsx 0.00% <0.00%> (ø)
...evices/RobotSettings/RobotSettingsCamera/index.tsx 0.00% <0.00%> (ø)
app/src/redux/shell/epic.ts 0.00% <0.00%> (ø)
...tocolRun/ProtocolRunCamera/LaunchLivestreamBtn.tsx 0.00% <0.00%> (ø)
...l-resources/images/hooks/useCameraUsageSettings.ts 0.00% <0.00%> (ø)
...ProtocolRun/SetupCamera/SetupRunCameraSettings.tsx 0.00% <0.00%> (ø)
...ganisms/Desktop/Devices/Peripherals/CameraCard.tsx 0.00% <0.00%> (ø)
...s/RobotSettingsCamera/RobotSettingsCameraUsage.tsx 0.00% <0.00%> (ø)

... and 115 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Resolved conflicts:
- app/src/organisms/ODD/QuickTransferFlow/utils/createQuickTransferFile.ts

Edited:
- app/src/organisms/Desktop/Devices/Peripherals/CameraCard.tsx
@ddcc4 ddcc4 force-pushed the merge-880-into-edge branch from caf1a07 to 820fab0 Compare November 13, 2025 17:01
Copy link
Contributor

@rclarke0 rclarke0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you! lgtm

@ddcc4 ddcc4 merged commit 820fab0 into edge Nov 13, 2025
106 of 107 checks passed
@ddcc4 ddcc4 deleted the merge-880-into-edge branch November 14, 2025 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants