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.

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

fix(api,app,shared-data): Fix LPC for protocols using the plate reader module. #16453

Merged
merged 6 commits into from
Oct 11, 2024
Merged

fix(api,app,shared-data): Fix LPC for protocols using the plate reader module. #16453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba2a846
fix(api,app): fix lpc for protocols using the plate reader module.
vegano1 Oct 4, 2024
b554c64
add allowedRoles `lid` to the plate reader lid definition.
vegano1 Oct 10, 2024
9f8a746
format
vegano1 Oct 10, 2024
6aad386
remove dup allowedRoles key
vegano1 Oct 10, 2024
b72e89f
Merge branch 'edge' into plate-reader-ommit-lpc
vegano1 Oct 10, 2024
0bf48be
format
vegano1 Oct 10, 2024
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
14 changes: 9 additions & 5 deletions api/src/opentrons/protocol_engine/commands/load_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from pydantic import BaseModel, Field

from .command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
from ..errors import ModuleNotLoadedError
from ..errors.error_occurrence import ErrorOccurrence
from ..types import (
DeckSlotLocation,
Expand Down Expand Up @@ -159,11 +160,14 @@ async def execute(
and params.model == ModuleModel.ABSORBANCE_READER_V1
and params.moduleId is not None
):
abs_reader = self._equipment.get_module_hardware_api(
self._state_view.modules.get_absorbance_reader_substate(
params.moduleId
).module_id
)
try:
abs_reader = self._equipment.get_module_hardware_api(
self._state_view.modules.get_absorbance_reader_substate(
params.moduleId
).module_id
)
except ModuleNotLoadedError:
abs_reader = None

if abs_reader is not None:
result = await abs_reader.get_current_lid_status()
Expand Down
5 changes: 4 additions & 1 deletion app/src/organisms/LabwarePositionCheck/useLaunchLPC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ import { getLabwareDefinitionsFromCommands } from '/app/molecules/Command/utils/

import type { RobotType } from '@opentrons/shared-data'

const filteredLabware = ['opentrons_tough_pcr_auto_sealing_lid']
const filteredLabware = [
'opentrons_tough_pcr_auto_sealing_lid',
'opentrons_flex_lid_absorbance_plate_reader_module',
]

export function useLaunchLPC(
runId: string,
Expand Down
7 changes: 6 additions & 1 deletion app/src/organisms/LabwarePositionCheck/utils/getProbeBasedLPCSteps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ function getAllCheckSectionSteps(
[]
)

return labwareLocations.map(
// HACK: Remove LPC for plate reader to unblock science.
vegano1 marked this conversation as resolved.
Show resolved Hide resolved
const filteredLabwareLocations = labwareLocations.filter(labware => {
return labware.location?.moduleModel !== 'absorbanceReaderV1'
})

return filteredLabwareLocations.map(
({ location, labwareId, moduleId, adapterId, definitionUri }) => ({
section: SECTIONS.CHECK_POSITIONS,
labwareId: labwareId,
Expand Down
2 changes: 1 addition & 1 deletion shared-data/labware/definitions/2/opentrons_flex_lid_absorbance_plate_reader_module/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"namespace": "opentrons",
"version": 1,
"schemaVersion": 2,
"allowedRoles": ["fixture"],
"allowedRoles": ["fixture", "lid"],
Copy link
Contributor

Choose a reason for hiding this comment

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

yay 🧢

"gripForce": 21.0,
"gripHeightFromLabwareBottom": 48.0,
"cornerOffsetFromSlot": {
Expand Down
Loading