Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(protocol-designer): wireup wasteChute commands #13953

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
b573960
debug
ncdiehl11 Nov 7, 2023
b9ef036
add check for tip attached in moveToAddressableArea
jerader Nov 7, 2023
736ca51
fix ternary for no tip attached
jerader Nov 7, 2023
b0eb442
feat(protocol-designer): wire up drop drop tip in waste chute commands
ncdiehl11 Nov 7, 2023
fc2bcf7
check for wasteChute
ncdiehl11 Nov 7, 2023
77b8e96
update tip state after dropTipInPlace, add test for replaceTip in was…
ncdiehl11 Nov 8, 2023
92c7760
lint
ncdiehl11 Nov 8, 2023
8d65cd7
feat(app): add command text for new commands
ncdiehl11 Nov 8, 2023
86cc374
initial tests
ncdiehl11 Nov 9, 2023
7606b19
add tests for all inPlace + moveToAddressableArea commands
ncdiehl11 Nov 9, 2023
4e8de51
factor PipettingRunTimeCommand type into AtLocation and InPlace
ncdiehl11 Nov 9, 2023
a21e340
reset unintended files out of scope of this PR
ncdiehl11 Nov 9, 2023
424f001
reset pipetting types for now
ncdiehl11 Nov 9, 2023
c561d37
stash fixture files
ncdiehl11 Nov 9, 2023
96c7905
clean up dropTip command logic
ncdiehl11 Nov 13, 2023
c7b53e7
add fixtures for 1000ul tiprack and 96-channel adapter
ncdiehl11 Nov 14, 2023
d28cab5
update replaceTip tests for 96-channel in waste chute
ncdiehl11 Nov 14, 2023
b19a928
update fixture tests to reflect 1000ul tiprack and adapter
ncdiehl11 Nov 14, 2023
574a1bb
fix json formatting
ncdiehl11 Nov 14, 2023
fe12f92
we need to make sure positions are updated after fast home failure(#1…
ahiuchingau Nov 7, 2023
6575b58
feat(app): add robot is busy banner to device details (#13932)
koji Nov 7, 2023
7da6f34
feat(api): Partial tip configuration (#13936)
sfoster1 Nov 7, 2023
e4435a1
listen to the right messages (#13937)
ahiuchingau Nov 7, 2023
dd14c20
refactor(app): replace RobotWorkSpace with BaseDeck in ProtocolSetup …
koji Nov 7, 2023
4a9a502
feat(app, app-shell): add download progress to robot update flows (#1…
mjhuff Nov 8, 2023
d631fc1
chore(api): fix push-ot3 for some versions of linux that can't use th…
ryanthecoder Nov 8, 2023
9d5418f
fix(api, shared-data, robot-server): stringify all error info in run …
fsinapi Nov 8, 2023
566027a
refactor(app): only show ODD runs loading screen when server returns …
shlokamin Nov 8, 2023
8c55cb1
fix(app): update video assets for attach and detach 96-channel pipett…
ncdiehl11 Nov 8, 2023
a14bfe3
fix(hardware-testing): Improvements to daily-setup process after more…
andySigler Nov 8, 2023
815ab8e
fix(protocol-designer): loadName in loadLabware is now true loadName …
jerader Nov 2, 2023
cc160b8
fix(protocol-designer): moving labware onto an adapter on the deck (#…
jerader Nov 3, 2023
bc63525
feat(robot-server): Add HTTP endpoints for getting and setting the ro…
SyntaxColoring Nov 8, 2023
93d83f1
refactor(protocol-designer): remove unneeded loadLabware commands fro…
jerader Nov 8, 2023
7a78164
refactor(app): update deckmap and deck configurator styling (#13946)
koji Nov 8, 2023
9fb282b
fix(hardware): error details should always be strings (#13948)
fsinapi Nov 8, 2023
fac2cef
fix(app): ODD LPC copy and styling (#13925)
ncdiehl11 Nov 8, 2023
73258b4
fix(app, robot_server): allow non-standard tip racks in tip length ca…
b-cooper Nov 8, 2023
f74f814
fix(app): fix last run protocol sorting on protocol dashboard (#13905)
b-cooper Nov 8, 2023
fd00fe2
feat(protocol-designer): modal updates and deck map design tweaks (#1…
jerader Nov 8, 2023
9c58438
fix(shared-data): remove requirement for current entry to TipHandling…
caila-marashaj Nov 8, 2023
3d8407c
chore(protocol-designer, labware-library): remove unused full story i…
b-cooper Nov 9, 2023
e376d3e
feat(app): allow multi file upload for labware and protocols (#13898)
b-cooper Nov 9, 2023
b31abc5
refactor(app, api-client): add utilities for parsing deck config via …
b-cooper Nov 9, 2023
cc8cf3c
feat(protocol-designer): wire up unused equipment logic for waste chu…
jerader Nov 9, 2023
5db8863
fix origin & target for fast home should not include other axes (#13955)
ahiuchingau Nov 9, 2023
66cd8fc
feat(app): final copy and animations for golden tip LPC probe screens…
smb2268 Nov 9, 2023
c784bbb
fix(app): module calibration should only use calibrated pipette (#13956)
smb2268 Nov 9, 2023
411bba3
refactor(app): remove unused analytics structures (#13893)
b-cooper Nov 9, 2023
f4112d3
fix(app): fix step meter tearing by using no animation (#13960)
mjhuff Nov 9, 2023
711f48a
fix(app): Fix desktop app update modals (#13935)
mjhuff Nov 9, 2023
df4b755
refactor(app): remove console log on release notes component (#13951)
shlokamin Nov 9, 2023
0bd816a
fix(shared-data): Fix the pipette schemas, tests (#13949)
sfoster1 Nov 9, 2023
90038a8
refactor(shared-data,app): migrate to deck definition v4 (#13931)
brenthagen Nov 10, 2023
daf6ea9
feat(app): add inPlace and moveToAddressableArea command text (#13958)
ncdiehl11 Nov 13, 2023
8e24967
fix(app): robot settings and wizard required equipment styling (#13928)
ncdiehl11 Nov 13, 2023
9562fab
feat(shared-data): add 8 moveable trashes (#13959)
shlokamin Nov 13, 2023
59eb677
refactor(api): Delete unused opentrons.containers module #13973
SyntaxColoring Nov 13, 2023
abdf902
refactor(shared-data): update movable trash offset from cutout fixtur…
shlokamin Nov 13, 2023
d8c8ffc
feat(step-generation): wire up moveLabware into waste chute (#13950)
jerader Nov 14, 2023
0498609
feat(protocol-designer): deck v4 touchups and staging area support (#…
jerader Nov 14, 2023
327f9b3
fix(app): fix protocol slideout whitescreen (#13977)
mjhuff Nov 14, 2023
7cc5d19
ci(labware-library): add build timeout of 30 minutes (#13978)
shlokamin Nov 14, 2023
eeb8162
initial tests
ncdiehl11 Nov 9, 2023
538283a
update wasteChute location in tests to be cutoutD3 to reflect deck de…
ncdiehl11 Nov 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ exports[`FilterCategory component renders 1`] = `
Tip Racks
</Link>
</li>
<li
className="filter_category_item"
key="adapter"
>
<Link
className="filter_category_link"
to="/?category=adapter"
>
Adapter
</Link>
</li>
</ul>
</Fragment>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import takeWhile from 'lodash/takeWhile'
import * as StepGeneration from '@opentrons/step-generation'
import { commandCreatorFromStepArgs } from '../file-data/selectors/commands'
import type { StepArgsAndErrorsById } from '../steplist/types'

export interface GenerateRobotStateTimelineArgs {
allStepArgsAndErrors: StepArgsAndErrorsById
orderedStepIds: string[]
Expand Down Expand Up @@ -65,18 +66,36 @@ export const generateRobotStateTimeline = (
// @ts-expect-error(sa, 2021-6-20): not a valid type narrow, use in operator
nextStepArgsForPipette.changeTip === 'never'

const isWasteChute =
invariantContext.additionalEquipmentEntities[dropTipLocation] != null

const pipetteSpec = invariantContext.pipetteEntities[pipetteId]?.spec

const addressableAreaName =
pipetteSpec.channels === 96
? '96ChannelWasteChute'
: '1and8ChannelWasteChute'

const dropTipCommand = isWasteChute
? StepGeneration.curryCommandCreator(
StepGeneration.wasteChuteCommandsUtil,
{
type: 'dropTip',
pipetteId: pipetteId,
addressableAreaName,
}
)
: StepGeneration.curryCommandCreator(StepGeneration.dropTip, {
pipette: pipetteId,
dropTipLocation,
})

if (!willReuseTip) {
return [
...acc,
(_invariantContext, _prevRobotState) =>
StepGeneration.reduceCommandCreators(
[
curriedCommandCreator,
StepGeneration.curryCommandCreator(StepGeneration.dropTip, {
pipette: pipetteId,
dropTipLocation,
}),
],
[curriedCommandCreator, dropTipCommand],
_invariantContext,
_prevRobotState
),
Expand Down
Loading
Loading