Skip to content

fix(app): Do not LPC in staging area slots #17926

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.

Sign up for GitHub

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

Merged
mjhuff merged 1 commit into from
Mar 28, 2025
+41 −3
Merged

fix(app): Do not LPC in staging area slots #17926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions ...lidLwLocationInfoByAnalysis/getLPCUniqValidLabwareLocationInfo/appendUniqValidLocCombo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import isEqual from 'lodash/isEqual'

import { getLabwareDefURI } from '@opentrons/shared-data'
import {
FLEX_STAGING_ADDRESSABLE_AREAS,
getLabwareDefURI,
} from '@opentrons/shared-data'

import type { LabwareDefinition2 } from '@opentrons/shared-data'
import type {
LabwareDefinition2,
LabwareLocationSequence,
} from '@opentrons/shared-data'
import type { LabwareLocationInfoWithLocSeq } from '.'

// Appends the labware location combo if it is "unique" to the existing list of combos
Expand Down Expand Up @@ -38,9 +44,12 @@ function isValidLocCombo(
)
const topMostLocSeqComponentKind =
combo.locationSequence[combo.locationSequence.length - 1].kind
const isInStagingAreaSlot = getIsInStagingAreaSlot(combo.locationSequence)

const isNotAnLPCablComponentKind =
topMostLocSeqComponentKind === 'notOnDeck' ||
topMostLocSeqComponentKind === 'inStackerHopper'
topMostLocSeqComponentKind === 'inStackerHopper' ||
isInStagingAreaSlot

const notLPCable =
lwDef == null ||
Expand All @@ -61,3 +70,20 @@ function isValidLocCombo(
)
}
}

function getIsInStagingAreaSlot(ls: LabwareLocationSequence): boolean {
const aaLocComponent = ls.find(
component => component.kind === 'onAddressableArea'
)

if (aaLocComponent != null) {
return (
aaLocComponent.kind === 'onAddressableArea' &&
FLEX_STAGING_ADDRESSABLE_AREAS.includes(
aaLocComponent.addressableAreaName
)
)
} else {
return false
}
}
12 changes: 12 additions & 0 deletions shared-data/js/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,18 @@ export const FLEX_MODULE_ADDRESSABLE_AREAS: AddressableAreaName[] = [
...MAGNETIC_BLOCK_ADDRESSABLE_AREAS,
]

export const FLEX_STAGING_ADDRESSABLE_AREAS: AddressableAreaName[] = [
...FLEX_STACKER_ADDRESSABLE_AREAS,
A4_ADDRESSABLE_AREA,
B4_ADDRESSABLE_AREA,
C4_ADDRESSABLE_AREA,
D4_ADDRESSABLE_AREA,
ABSORBANCE_READER_LID_DOCK_A4_ADDRESSABLE_AREA,
ABSORBANCE_READER_LID_DOCK_B4_ADDRESSABLE_AREA,
ABSORBANCE_READER_LID_DOCK_C4_ADDRESSABLE_AREA,
ABSORBANCE_READER_LID_DOCK_D4_ADDRESSABLE_AREA,
]

export const ADDRESSABLE_AREA_1: '1' = '1'
export const ADDRESSABLE_AREA_2: '2' = '2'
export const ADDRESSABLE_AREA_3: '3' = '3'
Expand Down
Loading