step generator move labware cleanup

Opentrons · Jan 17, 2025 · 02c7464 · 02c7464
1 parent d76f318
commit 02c7464
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/step-generation/src/commandCreators/atomic/moveLabware.ts b/step-generation/src/commandCreators/atomic/moveLabware.ts
@@ -48,6 +48,7 @@ export const moveLabware: CommandCreator<MoveLabwareArgs> = (
 
   const newLocationInWasteChute =
     newLocation !== 'offDeck' &&
+    newLocation !== 'systemLocation' &&
     'addressableAreaName' in newLocation &&
     newLocation.addressableAreaName === 'gripperWasteChute'
 
@@ -56,7 +57,9 @@ export const moveLabware: CommandCreator<MoveLabwareArgs> = (
   )
 
   const newLocationSlot =
-    newLocation !== 'offDeck' && 'slotName' in newLocation
+    newLocation !== 'offDeck' &&
+    newLocation !== 'systemLocation' &&
+    'slotName' in newLocation
       ? newLocation.slotName
       : null
 
@@ -134,12 +137,16 @@ export const moveLabware: CommandCreator<MoveLabwareArgs> = (
     }
   }
   const destModuleId =
-    newLocation !== 'offDeck' && 'moduleId' in newLocation
+    newLocation !== 'offDeck' &&
+    newLocation !== 'systemLocation' &&
+    'moduleId' in newLocation
       ? newLocation.moduleId
       : null
 
   const destAdapterId =
-    newLocation !== 'offDeck' && 'labwareId' in newLocation
+    newLocation !== 'offDeck' &&
+    newLocation !== 'systemLocation' &&
+    'labwareId' in newLocation
       ? newLocation.labwareId
       : null