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

feat(shared-data, api, hardware-testing): add the p200_96 #17105

Draft
wants to merge 9 commits into
base: edge
Choose a base branch
from
Draft

feat(shared-data, api, hardware-testing): add the p200_96 #17105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d17039a
update the shared data defs
ryanthecoder Dec 13, 2024
82370d0
fix places where the p200_96 wasn't being properly processed
ryanthecoder Dec 13, 2024
ecb6a38
pull in all the changes to the hardware-tesing repo that have been made
ryanthecoder Dec 13, 2024
c22f24c
fix the snapshot tests
ryanthecoder Dec 13, 2024
3d02f24
Pause for inspection
Andiiiiiiyy Dec 17, 2024
da318ca
changing liquid setting
Andiiiiiiyy Dec 20, 2024
9acbb56
format
ryanthecoder Dec 20, 2024
7de2e5e
fix ci tests
ryanthecoder Dec 20, 2024
c3f119f
update load calll from edge
ryanthecoder Dec 20, 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
9 changes: 6 additions & 3 deletions app/src/organisms/ODD/InstrumentMountItem/ProtocolInstrumentMountItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,11 @@ export function ProtocolInstrumentMountItem(
[]
)
const [flowType, setFlowType] = useState<string>(FLOWS.ATTACH)
const selectedPipette =
speccedName === 'p1000_96' ? NINETY_SIX_CHANNEL : SINGLE_MOUNT_PIPETTES
const is96ChannelPipette =
speccedName === 'p1000_96' || speccedName === 'p200_96'
const selectedPipette = is96ChannelPipette
? NINETY_SIX_CHANNEL
: SINGLE_MOUNT_PIPETTES

const handleCalibrate: MouseEventHandler = () => {
setFlowType(FLOWS.CALIBRATE)
Expand All @@ -95,7 +98,7 @@ export function ProtocolInstrumentMountItem(
setShowPipetteWizardFlow(true)
}
}
const is96ChannelPipette = speccedName === 'p1000_96'

const isAttachedWithCal =
attachedInstrument != null &&
attachedInstrument.ok &&
Expand Down
5 changes: 4 additions & 1 deletion app/src/organisms/PipetteWizardFlows/BeforeBeginning.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ export const BeforeBeginning = (
const displayName = pipetteDisplayName ?? requiredPipette.pipetteName
bodyTranslationKey = 'remove_labware'

if (requiredPipette.pipetteName === 'p1000_96') {
if (
requiredPipette.pipetteName === 'p1000_96' ||
requiredPipette.pipetteName === 'p200_96'
) {
equipmentList = [
{ ...NINETY_SIX_CHANNEL_PIPETTE, displayName },
CALIBRATION_PROBE,
Expand Down
3 changes: 2 additions & 1 deletion app/src/organisms/PipetteWizardFlows/DetachPipette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ export const DetachPipette = (props: DetachPipetteProps): JSX.Element => {
}
const memoizedAttachedPipettes = useMemo(() => attachedPipettes, [])
const is96ChannelPipette =
memoizedAttachedPipettes[mount]?.instrumentName === 'p1000_96'
memoizedAttachedPipettes[mount]?.instrumentName === 'p1000_96' ||
memoizedAttachedPipettes[mount]?.instrumentName === 'p200_96'
const pipetteName =
attachedPipettes[mount] != null
? attachedPipettes[mount]?.displayName
Expand Down
7 changes: 5 additions & 2 deletions app/src/organisms/PipetteWizardFlows/getPipetteWizardStepsForProtocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,11 @@ export const getPipetteWizardStepsForProtocol = (
): PipetteWizardStep[] | null => {
const requiredPipette = pipetteInfo.find(pipette => pipette.mount === mount)
const ninetySixChannelAttached =
attachedPipettes[LEFT]?.instrumentName === 'p1000_96'
const ninetySixChannelRequested = requiredPipette?.pipetteName === 'p1000_96'
attachedPipettes[LEFT]?.instrumentName === 'p1000_96' ||
attachedPipettes[LEFT]?.instrumentName === 'p200_96'
const ninetySixChannelRequested =
requiredPipette?.pipetteName === 'p1000_96' ||
requiredPipette?.pipetteName === 'p200_96'

if (requiredPipette == null) {
// return empty array if no pipette is required in the protocol
Expand Down
8 changes: 6 additions & 2 deletions app/src/organisms/PipetteWizardFlows/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,14 @@ export function usePipetteFlowWizardHeaderText(
)
} else if (
attachedPipettes[LEFT]?.data.channels === 96 &&
mountPipette?.pipetteName !== 'p1000_96'
mountPipette?.pipetteName !== 'p1000_96' &&
mountPipette?.pipetteName !== 'p200_96'
) {
return t('detach_96_attach_mount', { mount: capitalizedMount })
} else if (leftPipette?.pipetteName === 'p1000_96') {
} else if (
leftPipette?.pipetteName === 'p1000_96' ||
leftPipette?.pipetteName === 'p200_96'
) {
if (isGantryEmpty) {
return t('attach_96_channel')
} else if (
Expand Down
7 changes: 7 additions & 0 deletions hardware-testing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ test-photometric:
$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 1000 --channels 96 --tip 50 --trials 1
$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 1000 --channels 96 --tip 200 --trials 1
$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 200 --channels 96 --tip 50 --trials 1
$(python) -m hardware_testing.gravimetric --photometric --simulate --pipette 200 --channels 96 --tip 20 --trials 1

.PHONY: test-gravimetric-single
test-gravimetric-single:
Expand All @@ -123,6 +124,7 @@ test-gravimetric-multi:
test-gravimetric-96:
$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --channels 96 --trials 2 --no-blank
$(python) -m hardware_testing.gravimetric --simulate --pipette 200 --channels 96 --trials 2 --no-blank
$(python) -m hardware_testing.gravimetric --simulate --pipette 200 --channels 96 --trials 1 --no-blank --increment --tip 20

.PHONY: test-gravimetric
test-gravimetric:
Expand Down Expand Up @@ -229,6 +231,11 @@ push-no-restart-ot3: sdist Pipfile.lock
.PHONY: push-ot3
push-ot3: push-no-restart-ot3 push-plot-webpage-ot3 push-description-ot3 push-labware-ot3

.PHONE: open-dev-app
open-dev-app:
cd .. && $(MAKE) -C app dev


.PHONY: push-all
push-all: clean wheel push-no-restart push-plot-webpage-ot3

Expand Down
28 changes: 19 additions & 9 deletions hardware-testing/hardware_testing/gravimetric/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@

GRAVIMETRIC_CFG_INCREMENT = {
50: {
1: {50: gravimetric_ot3_p50_single},
1: {20: gravimetric_ot3_p50_single, 50: gravimetric_ot3_p50_single},
8: {50: gravimetric_ot3_p50_multi_50ul_tip_increment},
},
200: {
96: {
20: gravimetric_ot3_p200_96,
50: gravimetric_ot3_p200_96,
200: gravimetric_ot3_p200_96,
},
Expand Down Expand Up @@ -117,14 +118,19 @@
PHOTOMETRIC_CFG = {
50: {
1: {
20: photometric_ot3_p50_single,
50: photometric_ot3_p50_single,
},
8: {
50: photometric_ot3_p50_multi,
},
},
200: {
96: {50: photometric_ot3_p200_96, 200: photometric_ot3_p200_96},
96: {
20: photometric_ot3_p200_96,
50: photometric_ot3_p200_96,
200: photometric_ot3_p200_96,
},
},
1000: {
1: {
Expand All @@ -137,7 +143,11 @@
200: photometric_ot3_p1000_multi,
1000: photometric_ot3_p1000_multi,
},
96: {50: photometric_ot3_p1000_96, 200: photometric_ot3_p1000_96},
96: {
20: photometric_ot3_p1000_96,
50: photometric_ot3_p1000_96,
200: photometric_ot3_p1000_96,
},
},
}

Expand Down Expand Up @@ -177,11 +187,11 @@ def _get_protocol_context(cls, args: argparse.Namespace) -> ProtocolContext:
"Starting opentrons-robot-server, so we can http GET labware offsets"
)
LABWARE_OFFSETS.extend(workarounds.http_get_all_labware_offsets())
ui.print_info(f"found {len(LABWARE_OFFSETS)} offsets:")
for offset in LABWARE_OFFSETS:
ui.print_info(f"\t{offset.createdAt}:")
ui.print_info(f"\t\t{offset.definitionUri}")
ui.print_info(f"\t\t{offset.vector}")
# ui.print_info(f"found {len(LABWARE_OFFSETS)} offsets:")
# for offset in LABWARE_OFFSETS:
# ui.print_info(f"\t{offset.createdAt}:")
# ui.print_info(f"\t\t{offset.definitionUri}")
# ui.print_info(f"\t\t{offset.vector}")
# gather the custom labware (for simulation)
custom_defs = {}
if args.simulate:
Expand Down Expand Up @@ -572,7 +582,7 @@ def _main(
parser.add_argument("--simulate", action="store_true")
parser.add_argument("--pipette", type=int, choices=[50, 200, 1000], required=True)
parser.add_argument("--channels", type=int, choices=[1, 8, 96], default=1)
parser.add_argument("--tip", type=int, choices=[0, 50, 200, 1000], default=0)
parser.add_argument("--tip", type=int, choices=[0, 20, 50, 200, 1000], default=0)
parser.add_argument("--trials", type=int, default=0)
parser.add_argument("--increment", action="store_true")
parser.add_argument("--return-tip", action="store_true")
Expand Down
66 changes: 51 additions & 15 deletions hardware-testing/hardware_testing/gravimetric/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,30 +88,40 @@ class PhotometricConfig(VolumetricConfig):
LIQUID_PROBE_SETTINGS: Dict[int, Dict[int, Dict[int, Dict[str, int]]]] = {
50: {
1: {
20: {
"mount_speed": 5,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
},
8: {
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
},
},
200: {
96: {
20: {
"mount_speed": 5,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
200: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
}
Expand All @@ -120,51 +130,56 @@ class PhotometricConfig(VolumetricConfig):
1: {
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
200: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
1000: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
},
8: {
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
200: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
1000: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 15,
"sensor_threshold_pascals": 15,
},
},
96: {
20: {
"mount_speed": 5,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
50: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
200: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
1000: {
"mount_speed": 5,
"plunger_speed": 20,
"plunger_speed": 5,
"sensor_threshold_pascals": 15,
},
},
Expand Down Expand Up @@ -194,6 +209,7 @@ def _get_liquid_probe_settings(
QC_VOLUMES_G: Dict[int, Dict[int, List[Tuple[int, List[float]]]]] = {
1: {
50: [ # P50
(20, [1.0, 20.0]),
(50, [1.0, 50.0]), # T50
],
1000: [ # P1000
Expand All @@ -214,10 +230,12 @@ def _get_liquid_probe_settings(
},
96: {
200: [
(20, [0.5, 1.0]), # T20
(50, [1.0, 50.0]), # T50
(200, [200.0]), # T200
],
1000: [ # P1000
(20, [5.0]),
(50, [5.0]), # T50
(200, [200.0]), # T200
(1000, [1000.0]), # T1000
Expand Down Expand Up @@ -279,7 +297,8 @@ def _get_liquid_probe_settings(
},
96: {
200: [
(50, [1.0, 5.0]), # T50
(20, [1.0, 0.5]), # T50
(50, [50.0]), # T50
(200, [200.0]), # T200
],
1000: [ # P1000
Expand Down Expand Up @@ -311,6 +330,11 @@ def _get_liquid_probe_settings(
# channels: [Pipette: [tip: [Volume: (%d, Cv)]]]
1: {
50: { # P50
20: {
1.0: (5.0, 4.0),
10.0: (1.0, 0.5),
20.0: (1, 0.4),
},
50: {
1.0: (5.0, 4.0),
10.0: (1.0, 0.5),
Expand Down Expand Up @@ -363,12 +387,16 @@ def _get_liquid_probe_settings(
},
96: {
200: {
50: { # T50
20: { # T20
0.5: (2.5, 2.0),
1.0: (2.5, 2.0),
2.0: (2.5, 2.0),
3.0: (2.5, 2.0),
5.0: (2.5, 2.0),
10.0: (3.1, 1.7),
},
50: { # T50
1.0: (2.5, 2.0),
50.0: (1.5, 0.75),
},
200: { # T200
Expand All @@ -378,6 +406,14 @@ def _get_liquid_probe_settings(
},
},
1000: { # P1000
20: { # T20
1.0: (2.5, 2.0),
2.0: (2.5, 2.0),
3.0: (2.5, 2.0),
5.0: (2.5, 2.0),
10.0: (3.1, 1.7),
20.0: (3.1, 1.7),
},
50: { # T50
1.0: (2.5, 2.0),
2.0: (2.5, 2.0),
Expand Down
2 changes: 1 addition & 1 deletion hardware-testing/hardware_testing/gravimetric/execute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ def run(cfg: config.GravimetricConfig, resources: TestResources) -> None: # noq
assert resources.recorder is not None
recorder = resources.recorder
if resources.ctx.is_simulating():
start_sim_mass = {50: 15, 200: 200, 1000: 200}
start_sim_mass = {20: 5, 50: 15, 200: 200, 1000: 200}
resources.recorder.set_simulation_mass(start_sim_mass[cfg.tip_volume])
os.makedirs(
f"{resources.test_report.parent}/{resources.test_report._run_id}", exist_ok=True
Expand Down
5 changes: 5 additions & 0 deletions hardware-testing/hardware_testing/gravimetric/execute_photometric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"B": {"min": 10, "max": 49.99},
"C": {"min": 2, "max": 9.999},
"D": {"min": 1, "max": 1.999},
"E": {"min": 0, "max": 0.9999},
}
_MIN_START_VOLUME_UL = {1: 500, 8: 3000, 96: 30000}
_MIN_END_VOLUME_UL = {1: 400, 8: 3000, 96: 10000}
Expand Down Expand Up @@ -191,6 +192,8 @@ def _record_measurement_and_store(m_type: MeasurementType) -> EnvironmentData:
)

_record_measurement_and_store(MeasurementType.ASPIRATE)
if not trial.ctx.is_simulating():
input("请记录吸液状态，并尝试拍摄清晰的吸液后的针管照片..........")
for i in range(num_dispenses):
dest_name = _get_photo_plate_dest(trial.cfg, trial.trial)
dest_well = trial.dest[dest_name]
Expand All @@ -215,6 +218,8 @@ def _record_measurement_and_store(m_type: MeasurementType) -> EnvironmentData:
touch_tip=trial.cfg.touch_tip,
)
_record_measurement_and_store(MeasurementType.DISPENSE)
if not trial.ctx.is_simulating():
input("请记录排液状态，并尝试拍摄清晰的排液后的针管照片..........")
trial.pipette._retract() # retract to top of gantry
if (i + 1) == num_dispenses:
if not trial.cfg.same_tip:
Expand Down
Loading
Loading