Skip to content

Commit

Permalink
feat(protocol-designer): introduce touch tip speed field to moveLiquid (
Browse files Browse the repository at this point in the history
#17545)

This PR introduces aspirate and dispense touch tip speed to
`MoveLiquidsToolbox`, and wires up all the way down through step
generation.

Closes AUTH-909, Closes AUTH-910
  • Loading branch information
ncdiehl11 authored Feb 21, 2025
1 parent 477ed2f commit f0b21f7
Show file tree
Hide file tree
Showing 33 changed files with 489 additions and 3,356 deletions.
2 changes: 2 additions & 0 deletions app/src/organisms/ODD/QuickTransferFlow/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface QuickTransferSummaryState {
positionFromBottom: number
}
touchTipAspirate?: number
touchTipAspirateSpeed?: number
airGapAspirate?: number
tipPositionDispense: number
mixOnDispense?: {
Expand All @@ -62,6 +63,7 @@ export interface QuickTransferSummaryState {
positionFromBottom: number
}
touchTipDispense?: number
touchTipDispenseSpeed?: number
disposalVolume?: number
blowOut?: BlowOutLocation
airGapDispense?: number
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,13 @@ export function generateQuickTransferArgs(
aspirateAirGapVolume: quickTransferState.airGapAspirate ?? null,
dispenseAirGapVolume: quickTransferState.airGapDispense ?? null,
touchTipAfterAspirate: quickTransferState.touchTipAspirate != null,
touchTipAfterAspirateSpeed:
quickTransferState.touchTipAspirateSpeed ?? null,
touchTipAfterAspirateOffsetMmFromTop,
touchTipAfterDispense: quickTransferState.touchTipDispense != null,
touchTipAfterDispenseOffsetMmFromTop,
touchTipAfterDispenseSpeed:
quickTransferState.touchTipDispenseSpeed ?? null,
dropTipLocation,
aspirateXOffset: 0,
aspirateYOffset: 0,
Expand Down
11 changes: 9 additions & 2 deletions components/src/atoms/ListButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { StyleProps } from '../../primitives'

export * from './ListButtonChildren/index'

export type ListButtonType = 'noActive' | 'connected' | 'notConnected'
type ListButtonType = 'noActive' | 'connected' | 'notConnected' | 'onColor'

interface ListButtonProps extends StyleProps {
type: ListButtonType
Expand All @@ -35,6 +35,10 @@ const LISTBUTTON_PROPS_BY_TYPE: Record<
backgroundColor: COLORS.yellow30,
hoverBackgroundColor: COLORS.yellow35,
},
onColor: {
backgroundColor: COLORS.white,
hoverBackgroundColor: COLORS.grey10,
},
}

/*
Expand Down Expand Up @@ -78,7 +82,10 @@ export function ListButton(props: ListButtonProps): JSX.Element {
return (
<Flex
data-testid={testId ?? `ListButton_${type}`}
onClick={onClick}
onClick={(e: MouseEvent) => {
onClick?.()
e.stopPropagation()
}}
css={LIST_BUTTON_STYLE}
tabIndex={0}
{...styleProps}
Expand Down
Loading

0 comments on commit f0b21f7

Please sign in to comment.