From 21c9a9ad93bad89a765375677efc06c3dfcad646 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 8 Dec 2023 13:48:07 -0500 Subject: [PATCH 1/2] fix(app): remove probe check from module cal Module calibration doesn't require a pipette id and thus none is available here (and in general I believe you can do it with a gripper) so this isn't really an appropriate check. --- .../ModuleWizardFlows/AttachProbe.tsx | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx index 2e05dedd3ec..d0f7d5fe6bb 100644 --- a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx +++ b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx @@ -22,7 +22,6 @@ import { import { Banner } from '../../atoms/Banner' import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' -import { ProbeNotAttached } from '../PipetteWizardFlows/ProbeNotAttached' import type { ModuleCalibrationWizardStepProps } from './types' interface AttachProbeProps extends ModuleCalibrationWizardStepProps { @@ -67,9 +66,6 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { 'module_wizard_flows', 'pipette_wizard_flows', ]) - const [showUnableToDetect, setShowUnableToDetect] = React.useState( - false - ) const moduleDisplayName = getModuleDisplayName(attachedModule.moduleModel) const pipetteId = attachedPipette.serialNumber @@ -159,12 +155,6 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { setErrorMessage('calibration adapter has not been loaded yet') return } - const verifyCommands: CreateCommand[] = [ - { - commandType: 'verifyTipPresence', - params: { pipetteId: pipetteId, expectedState: 'present' }, - }, - ] const homeCommands: CreateCommand[] = [ { commandType: 'home' as const, @@ -188,18 +178,12 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { }, ] - chainRunCommands?.(verifyCommands, false) + chainRunCommands?.(homeCommands, false) .then(() => { - chainRunCommands?.(homeCommands, false) - .then(() => { - proceed() - }) - .catch((e: Error) => { - setErrorMessage(`error starting module calibration: ${e.message}`) - }) + proceed() }) .catch((e: Error) => { - setShowUnableToDetect(true) + setErrorMessage(`error starting module calibration: ${e.message}`) }) } @@ -225,14 +209,6 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { )} ) - else if (showUnableToDetect) - return ( - - ) // TODO: add calibration loading screen and error screen else return ( From 3dee992c74ed767f0f5a8cf6b5f972b6df3d39a0 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 8 Dec 2023 16:02:51 -0500 Subject: [PATCH 2/2] this was new too whoops probably should have been a sign --- app/src/organisms/ModuleWizardFlows/AttachProbe.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx index d0f7d5fe6bb..ee9d0be66ba 100644 --- a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx +++ b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx @@ -68,7 +68,6 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { ]) const moduleDisplayName = getModuleDisplayName(attachedModule.moduleModel) - const pipetteId = attachedPipette.serialNumber const attachedPipetteChannels = attachedPipette.data.channels let pipetteAttachProbeVideoSource, probeLocation