temp commit

Opentrons · Jan 30, 2025 · 698bd4b · 698bd4b
1 parent 42dc7bf
commit 698bd4b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 19 deletions.
diff --git a/protocol-designer/src/steplist/substepTimeline.ts b/protocol-designer/src/steplist/substepTimeline.ts
@@ -66,22 +66,17 @@ const _createNextTimelineFrame = (args: {
     volume: args.volume,
     activeTips: _getNewActiveTips(args.nextFrame.commands.slice(0, args.index)),
   }
-  const command = args.command
-  const isAirGapCommand =
-    'meta' in command && command.meta != null && 'isAirGap' in command.meta
 
   const newTimelineFrame =
     args.command.commandType === 'aspirate' ||
     args.command.commandType === 'aspirateInPlace'
       ? {
           ..._newTimelineFrameKeys,
           source: args.wellInfo,
-          isAirGap: isAirGapCommand,
         }
       : {
           ..._newTimelineFrameKeys,
           dest: args.wellInfo,
-          isAirGap: isAirGapCommand,
         }
   return newTimelineFrame
 }

diff --git a/step-generation/src/commandCreators/atomic/aspirate.ts b/step-generation/src/commandCreators/atomic/aspirate.ts
@@ -26,7 +26,6 @@ import type { Point } from '../../utils'
 export interface ExtendedAspirateParams extends AspDispAirgapParams {
   tipRack: string
   nozzles: NozzleConfigurationStyle | null
-  isAirGap?: boolean
 }
 /** Aspirate with given args. Requires tip. */
 export const aspirate: CommandCreator<ExtendedAspirateParams> = (

diff --git a/step-generation/src/fixtures/data.ts b/step-generation/src/fixtures/data.ts
@@ -104,4 +104,3 @@ export const DEST_LABWARE = 'destPlateId'
 export const TROUGH_LABWARE = 'troughId'
 export const DEFAULT_BLOWOUT_WELL = 'A1'
 export const TIPRACK_1 = 'tiprack1Id'
-export const AIR_GAP_META = { isAirGap: true } // to differentiate if the aspirate or dispense command is an air gap or not
diff --git a/step-generation/src/getNextRobotStateAndWarnings/forAspirate.ts b/step-generation/src/getNextRobotStateAndWarnings/forAspirate.ts
@@ -31,7 +31,7 @@ export function forAspirate(
     labwareDef,
     params.wellName
   )
-
+  console.log('volume in forAspirate', volume)
   console.assert(
     // @ts-expect-error (sa, 2021-05-03): this assert is unnecessary
     uniq(wellsForTips).length === allWellsShared ? 1 : wellsForTips.length,

diff --git a/step-generation/src/getNextRobotStateAndWarnings/index.ts b/step-generation/src/getNextRobotStateAndWarnings/index.ts
@@ -63,19 +63,11 @@ function _getNextRobotStateAndWarningsSingleCommand(
   assert(command, 'undefined command passed to getNextRobotStateAndWarning')
   switch (command.commandType) {
     case 'aspirate':
-      if (command.meta?.isAirGap === true) {
-        break
-      } else {
-        forAspirate(command.params, invariantContext, robotStateAndWarnings)
-      }
+      forAspirate(command.params, invariantContext, robotStateAndWarnings)
       break
 
     case 'dispense':
-      if (command.meta?.isAirGap === true) {
-        break
-      } else {
-        forDispense(command.params, invariantContext, robotStateAndWarnings)
-      }
+      forDispense(command.params, invariantContext, robotStateAndWarnings)
       break
 
     case 'blowout':

diff --git a/step-generation/src/utils/misc.ts b/step-generation/src/utils/misc.ts
@@ -112,7 +112,7 @@ export function splitLiquid(
   sourceLiquidState: LocationLiquidState
 ): SourceAndDest {
   const totalSourceVolume = getLocationTotalVolume(sourceLiquidState)
-
+  console.log('volume in splitLiquid', volume)
   if (totalSourceVolume === 0) {
     // Splitting from empty source
     return {