feat(protocol-designer): single channel partial tip support for 'defa…

…ult' primaryNozzle only closes AUTH-594 AUTH-596 AUTH-597 AUTH-598 AUTH-599
Opentrons · Jan 8, 2025 · 324471b · 324471b
1 parent 45f5ab3
commit 324471b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/protocol-designer/src/feature-flags/reducers.ts b/protocol-designer/src/feature-flags/reducers.ts
@@ -31,7 +31,7 @@ const initialFlags: Flags = {
     process.env.OT_PD_ENABLE_HOT_KEYS_DISPLAY === '1' || true,
   OT_PD_ENABLE_REACT_SCAN: process.env.OT_PD_ENABLE_REACT_SCAN === '1' || false,
   OT_PD_ENABLE_LIQUID_CLASSES:
-    process.env.OT_PD_ENABLE_LIQUID_CLASSES === '1' || false,
+    process.env.OT_PD_ENABLE_REACT_SCAN === '1' || false,
   OT_PD_ENABLE_PARTIAL_TIP_SUPPORT:
     process.env.OT_PD_ENABLE_PARTIAL_TIP_SUPPORT === '1' || false,
 }

diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/utils.ts b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/utils.ts
@@ -5,7 +5,7 @@ import {
   SOURCE_WELL_BLOWOUT_DESTINATION,
   DEST_WELL_BLOWOUT_DESTINATION,
 } from '@opentrons/step-generation'
-import { ALL, COLUMN, SINGLE } from '@opentrons/shared-data'
+import { SINGLE } from '@opentrons/shared-data'
 import { getFieldErrors } from '../../../../steplist/fieldLevel'
 import {
   getDisabledFields,
@@ -229,12 +229,8 @@ export const getNozzleType = (
   const is8Channel = pipette != null && pipette.spec.channels === 8
   if (is8Channel && nozzles !== SINGLE) {
     return '8-channel'
-  } else if (nozzles === COLUMN) {
-    return COLUMN
-  } else if (nozzles === ALL) {
-    return ALL
-  } else if (nozzles === SINGLE) {
-    return SINGLE
+  } else if (nozzles != null) {
+    return nozzles as NozzleType
   } else {
     return null
   }

diff --git a/step-generation/src/getNextRobotStateAndWarnings/forPickUpTip.ts b/step-generation/src/getNextRobotStateAndWarnings/forPickUpTip.ts
@@ -19,9 +19,7 @@ export function forPickUpTip(
   // pipette now has tip(s)
   tipState.pipettes[pipetteId] = true
   // remove tips from tiprack
-  console.log('nozzles', nozzles)
   if (pipetteSpec.channels === 1 || nozzles === SINGLE) {
-    console.log('hit here')
     tipState.tipracks[labwareId][wellName] = false
   } else if (pipetteSpec.channels === 8 || nozzles === COLUMN) {
     const allWells = tiprackDef.ordering.find(col => col[0] === wellName)

diff --git a/step-generation/src/robotStateSelectors.ts b/step-generation/src/robotStateSelectors.ts
@@ -59,7 +59,7 @@ export function _getNextTip(args: {
   const tiprackDef = invariantContext.labwareEntities[tiprackId]?.def
 
   const hasTip = (wellName: string): boolean => tiprackWellsState[wellName]
-  console.log(nozzles)
+
   const orderedWells = orderWells(tiprackDef.ordering, 't2b', 'l2r')
   if (pipetteChannels === 1 || nozzles === SINGLE) {
     const well = orderedWells.find(hasTip)

diff --git a/step-generation/src/utils/misc.ts b/step-generation/src/utils/misc.ts
@@ -213,7 +213,7 @@ export function getWellsForTips(
   // Array of wells corresponding to the tip at each position.
   const wellsForTips =
     channels === 1 ? [well] : getWellNamePerMultiTip(labwareDef, well, channels)
-  console.log('channels from getWellsForTips', channels)
+
   if (!wellsForTips) {
     console.warn(
       channels === 1

diff --git a/step-generation/src/utils/safePipetteMovements.ts b/step-generation/src/utils/safePipetteMovements.ts
@@ -77,7 +77,7 @@ const getPipetteBoundsAtSpecifiedMoveToPosition = (
   pipetteEntity: PipetteEntity,
   tipLength: number,
   wellTargetPoint: Point,
-  primaryNozzle: string // hardcoding A12 becasue only column pick up supported currently
+  primaryNozzle: string
 ): Point[] => {
   const {
     nozzleMap,