diff --git a/app/src/assets/localization/en/quick_transfer.json b/app/src/assets/localization/en/quick_transfer.json
index c57ba5b8878..c448de06a72 100644
--- a/app/src/assets/localization/en/quick_transfer.json
+++ b/app/src/assets/localization/en/quick_transfer.json
@@ -135,7 +135,7 @@
"touch_tip_position_mm": "Touch tip position from top of well (mm)",
"touch_tip_value": "{{position}} mm from bottom",
"use_deck_slots": "Quick transfers use deck slots B2-D2. These slots hold a tip rack, a source labware, and a destination labware.Make sure that your deck configuration is up to date to avoid collisions.",
- "value_out_of_range": "Value must be between {{min}}-{{max}}",
+ "value_out_of_range": "Value must be between {{min}} to {{max}}",
"too_many_pins_body": "Remove a quick transfer in order to add more transfers to your pinned list.",
"too_many_pins_header": "You've hit your max!",
"transfer_analysis_failed": "quick transfer analysis failed",
diff --git a/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/TouchTip.test.tsx b/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/TouchTip.test.tsx
index e0ad2a7b33e..2fe512b22dc 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/TouchTip.test.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/TouchTip.test.tsx
@@ -145,7 +145,7 @@ describe('TouchTip', () => {
expect(vi.mocked(InputField)).toHaveBeenCalledWith(
{
title: 'Touch tip position from top of well (mm)',
- error: 'Value must be between -25-0',
+ error: 'Value must be between -25 to 0',
readOnly: true,
type: 'number',
value: -98,
@@ -171,7 +171,7 @@ describe('TouchTip', () => {
expect(vi.mocked(InputField)).toHaveBeenCalledWith(
{
title: 'Touch tip position from top of well (mm)',
- error: 'Value must be between -100-0',
+ error: 'Value must be between -100 to 0',
readOnly: true,
type: 'number',
value: 1,
diff --git a/protocol-designer/src/organisms/TipPositionModal/utils.tsx b/protocol-designer/src/organisms/TipPositionModal/utils.tsx
index 06cf2fab78a..0ed88bb6a40 100644
--- a/protocol-designer/src/organisms/TipPositionModal/utils.tsx
+++ b/protocol-designer/src/organisms/TipPositionModal/utils.tsx
@@ -12,26 +12,18 @@ export function getDefaultMmFromEdge(args: { name: StepFieldName }): number {
const { name } = args
switch (name) {
- case 'aspirate_mmFromBottom':
- return DEFAULT_MM_OFFSET_FROM_BOTTOM
-
- case 'aspirate_delay_mmFromBottom':
- return DEFAULT_MM_OFFSET_FROM_BOTTOM
-
+ case 'mix_mmFromBottom':
case 'dispense_mmFromBottom':
- return DEFAULT_MM_OFFSET_FROM_BOTTOM
-
case 'dispense_delay_mmFromBottom':
- return DEFAULT_MM_OFFSET_FROM_BOTTOM
-
- case 'mix_mmFromBottom':
+ case 'aspirate_delay_mmFromBottom':
+ case 'aspirate_mmFromBottom':
return DEFAULT_MM_OFFSET_FROM_BOTTOM
default:
// touch tip fields
console.assert(
getIsTouchTipField(name),
- `getDefaultMmFromBottom fn does not know what to do with field ${name}`
+ `getDefaultMmFromEdge fn does not know what to do with field ${name}`
)
return DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_TOP
}
diff --git a/protocol-designer/src/steplist/formLevel/stepFormToArgs/mixFormToArgs.ts b/protocol-designer/src/steplist/formLevel/stepFormToArgs/mixFormToArgs.ts
index 86158dc39e6..803b75422ac 100644
--- a/protocol-designer/src/steplist/formLevel/stepFormToArgs/mixFormToArgs.ts
+++ b/protocol-designer/src/steplist/formLevel/stepFormToArgs/mixFormToArgs.ts
@@ -38,7 +38,7 @@ export const mixFormToArgs = (
)
const touchTip = Boolean(hydratedFormData.mix_touchTip_checkbox)
const touchTipMmFromTop =
- hydratedFormData.mix_touchTip_mmFromTop ||
+ hydratedFormData.mix_touchTip_mmFromTop ??
DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_TOP
const volume = hydratedFormData.volume || 0
const times = hydratedFormData.times || 0
diff --git a/protocol-designer/src/steplist/formLevel/stepFormToArgs/moveLiquidFormToArgs.ts b/protocol-designer/src/steplist/formLevel/stepFormToArgs/moveLiquidFormToArgs.ts
index 3a0f0a7e964..e6827ac2e9c 100644
--- a/protocol-designer/src/steplist/formLevel/stepFormToArgs/moveLiquidFormToArgs.ts
+++ b/protocol-designer/src/steplist/formLevel/stepFormToArgs/moveLiquidFormToArgs.ts
@@ -128,13 +128,13 @@ export const moveLiquidFormToArgs = (
hydratedFormData.aspirate_touchTip_checkbox
)
const touchTipAfterAspirateOffsetMmFromTop =
- hydratedFormData.aspirate_touchTip_mmFromTop ||
+ hydratedFormData.aspirate_touchTip_mmFromTop ??
DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_TOP
const touchTipAfterDispense = Boolean(
hydratedFormData.dispense_touchTip_checkbox
)
const touchTipAfterDispenseOffsetMmFromTop =
- hydratedFormData.dispense_touchTip_mmFromTop ||
+ hydratedFormData.dispense_touchTip_mmFromTop ??
DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_TOP
const mixBeforeAspirate = getMixData(
hydratedFormData,
diff --git a/protocol-designer/src/steplist/formLevel/stepFormToArgs/test/moveLiquidFormToArgs.test.ts b/protocol-designer/src/steplist/formLevel/stepFormToArgs/test/moveLiquidFormToArgs.test.ts
index 9ec3f4eaad1..1ae269a33df 100644
--- a/protocol-designer/src/steplist/formLevel/stepFormToArgs/test/moveLiquidFormToArgs.test.ts
+++ b/protocol-designer/src/steplist/formLevel/stepFormToArgs/test/moveLiquidFormToArgs.test.ts
@@ -189,14 +189,14 @@ describe('move liquid step form -> command creator args', () => {
},
{
checkboxField: 'dispense_touchTip_checkbox',
- formFields: { dispense_touchTip_mmFromTop: -42 },
+ formFields: { dispense_touchTip_mmFromTop: -22 },
expectedArgsUnchecked: {
touchTipAfterDispense: false,
- touchTipAfterDispenseOffsetMmFromTop: -42,
+ touchTipAfterDispenseOffsetMmFromTop: -22,
},
expectedArgsChecked: {
touchTipAfterDispense: true,
- touchTipAfterDispenseOffsetMmFromTop: -42,
+ touchTipAfterDispenseOffsetMmFromTop: -22,
},
},
// MIXES
diff --git a/protocol-designer/src/steplist/test/generateSubsteps.test.ts b/protocol-designer/src/steplist/test/generateSubsteps.test.ts
index 95629d259dc..8994f921232 100644
--- a/protocol-designer/src/steplist/test/generateSubsteps.test.ts
+++ b/protocol-designer/src/steplist/test/generateSubsteps.test.ts
@@ -364,7 +364,7 @@ describe('generateSubstepItem', () => {
volume: 50,
times: 2,
touchTip: false,
- touchTipMmFromTop: 5,
+ touchTipMmFromTop: -5,
changeTip: 'always',
blowoutLocation: null,
blowoutFlowRateUlSec: 3,
diff --git a/protocol-designer/src/timelineMiddleware/__tests__/generateRobotStateTimeline.test.ts b/protocol-designer/src/timelineMiddleware/__tests__/generateRobotStateTimeline.test.ts
index 0c163a7d33b..21f16d4a03d 100644
--- a/protocol-designer/src/timelineMiddleware/__tests__/generateRobotStateTimeline.test.ts
+++ b/protocol-designer/src/timelineMiddleware/__tests__/generateRobotStateTimeline.test.ts
@@ -40,9 +40,9 @@ describe('generateRobotStateTimeline', () => {
dispenseAirGapVolume: null,
mixInDestination: null,
touchTipAfterAspirate: false,
- touchTipAfterAspirateOffsetMmFromTop: 13.81,
+ touchTipAfterAspirateOffsetMmFromTop: -13.81,
touchTipAfterDispense: false,
- touchTipAfterDispenseOffsetMmFromTop: 13.81,
+ touchTipAfterDispenseOffsetMmFromTop: -13.81,
name: 'transfer',
commandCreatorFnName: 'transfer',
blowoutLocation: null,
@@ -80,9 +80,9 @@ describe('generateRobotStateTimeline', () => {
dispenseAirGapVolume: null,
mixInDestination: null,
touchTipAfterAspirate: false,
- touchTipAfterAspirateOffsetMmFromTop: 13.81,
+ touchTipAfterAspirateOffsetMmFromTop: -13.81,
touchTipAfterDispense: false,
- touchTipAfterDispenseOffsetMmFromTop: 13.81,
+ touchTipAfterDispenseOffsetMmFromTop: -13.81,
name: 'transfer',
commandCreatorFnName: 'transfer',
blowoutLocation: null,
@@ -110,7 +110,7 @@ describe('generateRobotStateTimeline', () => {
volume: 5,
times: 2,
touchTip: false,
- touchTipMmFromTop: 13.81,
+ touchTipMmFromTop: -13.81,
changeTip: 'always',
blowoutLocation: null,
pipette: DEFAULT_PIPETTE,
diff --git a/protocol-designer/src/ui/steps/__fixtures__/index.ts b/protocol-designer/src/ui/steps/__fixtures__/index.ts
index f5d284d73ac..67accdaad75 100644
--- a/protocol-designer/src/ui/steps/__fixtures__/index.ts
+++ b/protocol-designer/src/ui/steps/__fixtures__/index.ts
@@ -16,7 +16,7 @@ export const getMockMoveLiquidStep = (): SavedStepFormState => ({
aspirate_mix_volume: '5',
aspirate_mmFromBottom: 1,
aspirate_touchTip_checkbox: true,
- aspirate_touchTip_mmFromTop: 1,
+ aspirate_touchTip_mmFromTop: -1,
dispense_flowRate: null,
dispense_labware: 'dispense_labware_id',
dispense_wells: ['A1'],
@@ -27,7 +27,7 @@ export const getMockMoveLiquidStep = (): SavedStepFormState => ({
dispense_mix_volume: null,
dispense_mmFromBottom: 0.5,
dispense_touchTip_checkbox: true,
- dispense_touchTip_mmFromTop: 1,
+ dispense_touchTip_mmFromTop: -1,
disposalVolume_checkbox: true,
disposalVolume_volume: '20',
blowout_checkbox: true,
diff --git a/protocol-designer/src/ui/steps/test/selectors.test.ts b/protocol-designer/src/ui/steps/test/selectors.test.ts
index 80728ee2919..1e1dd3f152b 100644
--- a/protocol-designer/src/ui/steps/test/selectors.test.ts
+++ b/protocol-designer/src/ui/steps/test/selectors.test.ts
@@ -509,7 +509,7 @@ describe('_getSavedMultiSelectFieldValues', () => {
isIndeterminate: false,
},
aspirate_touchTip_mmFromTop: {
- value: 1,
+ value: -1,
isIndeterminate: false,
},
// dispense settings
@@ -570,7 +570,7 @@ describe('_getSavedMultiSelectFieldValues', () => {
isIndeterminate: false,
},
dispense_touchTip_mmFromTop: {
- value: 1,
+ value: -1,
isIndeterminate: false,
},
blowout_checkbox: {
@@ -760,7 +760,7 @@ describe('_getSavedMultiSelectFieldValues', () => {
},
aspirate_touchTip_mmFromTop: {
isIndeterminate: false,
- value: 1,
+ value: -1,
},
// dispense settings
dispense_labware: {
@@ -812,7 +812,7 @@ describe('_getSavedMultiSelectFieldValues', () => {
},
dispense_touchTip_mmFromTop: {
isIndeterminate: false,
- value: 1,
+ value: -1,
},
blowout_checkbox: {
isIndeterminate: true,
@@ -974,7 +974,7 @@ describe('_getSavedMultiSelectFieldValues', () => {
dispense_delay_checkbox: true,
dispense_delay_seconds: '3',
mix_touchTip_checkbox: true,
- mix_touchTip_mmFromTop: '14',
+ mix_touchTip_mmFromTop: '-14',
nozzles: null,
},
}
diff --git a/step-generation/src/__tests__/consolidate.test.ts b/step-generation/src/__tests__/consolidate.test.ts
index 3979d47f681..6a00b13006f 100644
--- a/step-generation/src/__tests__/consolidate.test.ts
+++ b/step-generation/src/__tests__/consolidate.test.ts
@@ -1080,7 +1080,7 @@ describe('consolidate single-channel', () => {
preWetTip: true,
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -1209,7 +1209,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -1302,7 +1302,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -1451,7 +1451,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -1568,7 +1568,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -1717,7 +1717,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -1773,7 +1773,7 @@ describe('consolidate single-channel', () => {
preWetTip: true,
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -1908,7 +1908,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2001,7 +2001,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2165,7 +2165,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -2282,7 +2282,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2446,7 +2446,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -2499,7 +2499,7 @@ describe('consolidate single-channel', () => {
preWetTip: true,
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -2634,7 +2634,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2727,7 +2727,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2891,7 +2891,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -3051,7 +3051,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -3215,7 +3215,7 @@ describe('consolidate single-channel', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
diff --git a/step-generation/src/__tests__/distribute.test.ts b/step-generation/src/__tests__/distribute.test.ts
index db0e67a0c6d..2264f4b44b3 100644
--- a/step-generation/src/__tests__/distribute.test.ts
+++ b/step-generation/src/__tests__/distribute.test.ts
@@ -859,7 +859,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
},
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -884,7 +884,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
},
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -919,7 +919,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -967,7 +967,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1000,7 +1000,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1050,7 +1050,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1089,7 +1089,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1140,7 +1140,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1172,7 +1172,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1220,7 +1220,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1253,7 +1253,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1305,7 +1305,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1346,7 +1346,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1397,7 +1397,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1430,7 +1430,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1479,7 +1479,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1512,7 +1512,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1564,7 +1564,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1605,7 +1605,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1656,7 +1656,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
@@ -1689,7 +1689,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
}),
diff --git a/step-generation/src/__tests__/transfer.test.ts b/step-generation/src/__tests__/transfer.test.ts
index 06f7c700f44..9ed463aecb7 100644
--- a/step-generation/src/__tests__/transfer.test.ts
+++ b/step-generation/src/__tests__/transfer.test.ts
@@ -1092,7 +1092,7 @@ describe('advanced options', () => {
},
aspirateDelay: { seconds: 11, mmFromBottom: 15 },
touchTipAfterAspirate: true,
- touchTipAfterAspirateOffsetMmFromTop: 14.5,
+ touchTipAfterAspirateOffsetMmFromTop: -14.5,
aspirateAirGapVolume: 31,
// dispense column
dispenseDelay: { seconds: 12, mmFromBottom: 14 },
@@ -1277,7 +1277,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -1472,7 +1472,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -1587,7 +1587,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -1777,7 +1777,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -1994,7 +1994,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2184,7 +2184,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -2301,7 +2301,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2490,7 +2490,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -2734,7 +2734,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -2924,7 +2924,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -3041,7 +3041,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -3231,7 +3231,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -3473,7 +3473,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -3663,7 +3663,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
@@ -3837,7 +3837,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 14.5,
+ z: -14.5,
},
},
},
@@ -4027,7 +4027,7 @@ describe('advanced options', () => {
wellLocation: {
origin: 'top',
offset: {
- z: 3.4,
+ z: -3.4,
},
},
},
diff --git a/step-generation/src/fixtures/commandFixtures.ts b/step-generation/src/fixtures/commandFixtures.ts
index 48c14a0fbd4..37e4ed07a44 100644
--- a/step-generation/src/fixtures/commandFixtures.ts
+++ b/step-generation/src/fixtures/commandFixtures.ts
@@ -55,7 +55,7 @@ export const BLOWOUT_FLOW_RATE = 2.3
export const ASPIRATE_OFFSET_FROM_BOTTOM_MM = 3.1
export const DISPENSE_OFFSET_FROM_BOTTOM_MM = 3.2
export const BLOWOUT_OFFSET_FROM_TOP_MM = 3.3
-const TOUCH_TIP_OFFSET_FROM_BOTTOM_MM = 3.4
+const TOUCH_TIP_OFFSET_FROM_TOP_MM = -3.4
interface FlowRateAndOffsetParamsTransferlike {
aspirateFlowRateUlSec: number
dispenseFlowRateUlSec: number
@@ -74,8 +74,8 @@ export const getFlowRateAndOffsetParamsTransferLike = (): FlowRateAndOffsetParam
dispenseOffsetFromBottomMm: DISPENSE_OFFSET_FROM_BOTTOM_MM,
blowoutOffsetFromTopMm: BLOWOUT_OFFSET_FROM_TOP_MM,
// for consolidate/distribute/transfer only
- touchTipAfterAspirateOffsetMmFromTop: TOUCH_TIP_OFFSET_FROM_BOTTOM_MM,
- touchTipAfterDispenseOffsetMmFromTop: TOUCH_TIP_OFFSET_FROM_BOTTOM_MM,
+ touchTipAfterAspirateOffsetMmFromTop: TOUCH_TIP_OFFSET_FROM_TOP_MM,
+ touchTipAfterDispenseOffsetMmFromTop: TOUCH_TIP_OFFSET_FROM_TOP_MM,
})
interface FlowRateAndOffsetParamsMix {
aspirateFlowRateUlSec: number
@@ -94,7 +94,7 @@ export const getFlowRateAndOffsetParamsMix = (): FlowRateAndOffsetParamsMix => (
dispenseOffsetFromBottomMm: DISPENSE_OFFSET_FROM_BOTTOM_MM,
blowoutOffsetFromTopMm: BLOWOUT_OFFSET_FROM_TOP_MM,
// for mix only
- touchTipMmFromTop: TOUCH_TIP_OFFSET_FROM_BOTTOM_MM,
+ touchTipMmFromTop: TOUCH_TIP_OFFSET_FROM_TOP_MM,
})
type MakeAspDispHelper = (
bakedParams?: Partial
@@ -253,7 +253,7 @@ const _defaultTouchTipParams = {
wellLocation: {
origin: 'top' as const,
offset: {
- z: TOUCH_TIP_OFFSET_FROM_BOTTOM_MM,
+ z: TOUCH_TIP_OFFSET_FROM_TOP_MM,
},
},
}