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

fix(step-generation): remove unneeded dispense after airGapInPlace #17390

Closed
wants to merge 4 commits into from
Closed

fix(step-generation): remove unneeded dispense after airGapInPlace #17390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
698bd4b
temp commit
jerader Jan 30, 2025
71c7a0d
fix(step-generation): remove unneeded dispense after airGapInPlace
jerader Jan 31, 2025
a008d58
remove console.logs
jerader Jan 31, 2025
24b85c8
fix test
jerader Jan 31, 2025
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
5 changes: 0 additions & 5 deletions protocol-designer/src/steplist/substepTimeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 0 additions & 8 deletions protocol-designer/src/steplist/test/generateSubsteps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ describe('generateSubstepItem', () => {
preIngreds: {},
well: 'C1',
},
isAirGap: false,
},
],
},
Expand Down Expand Up @@ -240,7 +239,6 @@ describe('generateSubstepItem', () => {
preIngreds: {},
well: 'A1',
},
isAirGap: false,
source: {
postIngreds: {},
preIngreds: {},
Expand Down Expand Up @@ -295,7 +293,6 @@ describe('generateSubstepItem', () => {
labwareId: tiprackId,
wellName: 'A1',
},
isAirGap: false,
source: { well: 'A1', preIngreds: {}, postIngreds: {} },
dest: {
well: 'A1',
Expand All @@ -316,7 +313,6 @@ describe('generateSubstepItem', () => {
labwareId: tiprackId,
wellName: 'A1',
},
isAirGap: false,
dest: {
postIngreds: {
__air__: {
Expand Down Expand Up @@ -407,7 +403,6 @@ describe('generateSubstepItem', () => {
preIngreds: {},
well: 'A1',
},
isAirGap: false,
source: {
postIngreds: {},
preIngreds: {},
Expand All @@ -434,7 +429,6 @@ describe('generateSubstepItem', () => {
},
well: 'A1',
},
isAirGap: false,
source: {
postIngreds: {
__air__: {
Expand Down Expand Up @@ -465,7 +459,6 @@ describe('generateSubstepItem', () => {
preIngreds: {},
well: 'A2',
},
isAirGap: false,
source: {
postIngreds: {},
preIngreds: {},
Expand All @@ -492,7 +485,6 @@ describe('generateSubstepItem', () => {
},
well: 'A2',
},
isAirGap: false,
source: {
postIngreds: {
__air__: {
Expand Down
60 changes: 0 additions & 60 deletions step-generation/src/__tests__/distribute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
makeAspirateHelper,
makeContext,
makeDispenseHelper,
makeDispenseAirGapHelper,
makeTouchTipHelper,
pickUpTipHelper,
SOURCE_LABWARE,
Expand All @@ -37,16 +36,6 @@ import {
DEST_WELL_BLOWOUT_DESTINATION,
} from '../utils/misc'

const dispenseAirGapHelper = makeDispenseAirGapHelper({
wellLocation: {
origin: 'bottom',
offset: {
x: 0,
y: 0,
z: 11.54,
},
},
})
const aspirateHelper = makeAspirateHelper()
const dispenseHelper = makeDispenseHelper()
const touchTipHelper = makeTouchTipHelper()
Expand Down Expand Up @@ -450,8 +439,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),
delayCommand(12),

dispenseAirGapHelper('A2', 5),
dispenseHelper('A2', 100),
dispenseHelper('A3', 100),

Expand All @@ -460,7 +447,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),
delayCommand(12),
dispenseAirGapHelper('A4', 5),
dispenseHelper('A4', 100),
dispenseHelper('A5', 100),
])
Expand Down Expand Up @@ -488,14 +474,12 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
aspirateHelper('A1', 200),
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),
dispenseAirGapHelper('A2', 5),
dispenseHelper('A2', 100),
dispenseHelper('A3', 100),

aspirateHelper('A1', 200),
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),
dispenseAirGapHelper('A4', 5),
dispenseHelper('A4', 100),
dispenseHelper('A5', 100),
])
Expand Down Expand Up @@ -524,9 +508,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
aspirateHelper('A1', 200),
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),

dispenseAirGapHelper('A2', 5),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
dispenseHelper('A3', 100),
Expand All @@ -535,9 +516,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
aspirateHelper('A1', 200),
makeMoveToWellHelper('A1'),
makeAirGapHelper(5),

dispenseAirGapHelper('A4', 5),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
dispenseHelper('A5', 100),
Expand Down Expand Up @@ -928,8 +906,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('B1', 31),
delayCommand(12),
dispenseHelper('B1', 45),
...delayWithOffset('B1', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -976,8 +952,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1008,8 +982,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeMoveToWellHelper('A1'),
makeAirGapHelper(31),
delayCommand(11),
dispenseAirGapHelper('A4', 31),
delayCommand(12),
// dispense #3
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
Expand Down Expand Up @@ -1059,8 +1031,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1098,8 +1068,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1149,8 +1117,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1181,8 +1147,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1229,8 +1193,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1262,8 +1224,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1314,8 +1274,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1355,8 +1313,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1406,8 +1362,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1439,8 +1393,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1488,8 +1440,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1521,8 +1471,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1573,8 +1521,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1614,8 +1560,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down Expand Up @@ -1665,8 +1609,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #1
dispenseAirGapHelper('A2', 31),
delayCommand(12),
dispenseHelper('A2', 100),
...delayWithOffset('A2', DEST_LABWARE),
// touch tip (disp #1)
Expand Down Expand Up @@ -1698,8 +1640,6 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
makeAirGapHelper(31),
delayCommand(11),
// dispense #3
dispenseAirGapHelper('A4', 31),
delayCommand(12),
dispenseHelper('A4', 100),
...delayWithOffset('A4', DEST_LABWARE),
// touch tip (disp #3)
Expand Down
Loading
Loading