@opentrons/shared-data 0.1.7-alpha.0 → 0.1.7-alpha.1

package/lib/js/constants.d.ts

@@ -1,5 +1,6 @@
-import type { CutoutFixtureId, CutoutId, AddressableAreaName } from '../deck';
-import type { ModuleModel, ModuleType } from './types';
+import type { WellOrigin } from '../command';
+import type { AddressableAreaName, CutoutFixtureId, CutoutId } from '../deck';
+import type { ModuleModel, ModuleType, PositionReference } from './types';
 export declare const SLOT_LENGTH_MM = 127.76;
 export declare const SLOT_WIDTH_MM = 85.48;
 export declare const SLOT_RENDER_WIDTH = 127.76;
@@ -27,7 +28,7 @@ export declare const GRIPPER_V1: 'gripperV1';
 export declare const GRIPPER_V1_1: 'gripperV1.1';
 export declare const GRIPPER_V1_2: 'gripperV1.2';
 export declare const GRIPPER_V1_3: 'gripperV1.3';
-export declare const GRIPPER_MODELS: ("gripperV1" | "gripperV1.1" | "gripperV1.2" | "gripperV1.3")[];
+export declare const GRIPPER_MODELS: ("gripperV1.1" | "gripperV1.2" | "gripperV1.3" | "gripperV1")[];
 export declare const OT2_DISPLAY_NAME: 'Opentrons OT-2';
 export declare const FLEX_DISPLAY_NAME: 'Opentrons Flex';
 export declare const FLEX: 'FLEX';
@@ -46,14 +47,14 @@ export declare const ABSORBANCE_READER_TYPE: 'absorbanceReaderType';
 export declare const FLEX_STACKER_MODULE_TYPE: 'flexStackerModuleType';
 export declare const MAGNETIC_MODULE_MODELS: ("magneticModuleV1" | "magneticModuleV2")[];
 export declare const NON_CONNECTING_MODULE_TYPES: ModuleType[];
-export declare const TEMPERATURE_MODULE_MODELS: ("temperatureModuleV1" | "temperatureModuleV2")[];
+export declare const TEMPERATURE_MODULE_MODELS: ("temperatureModuleV2" | "temperatureModuleV1")[];
 export declare const THERMOCYCLER_MODULE_MODELS: ("thermocyclerModuleV2" | "thermocyclerModuleV1")[];
 export declare const HEATERSHAKER_MODULE_MODELS: "heaterShakerModuleV1"[];
 export declare const ABSORBANCE_READER_MODELS: "absorbanceReaderV1"[];
 export declare const FLEX_STACKER_MODULE_MODELS: "flexStackerModuleV1"[];
 export declare const MAGNETIC_BLOCK_MODELS: "magneticBlockV1"[];
-export declare const MODULE_MODELS: ("thermocyclerModuleV2" | "temperatureModuleV1" | "temperatureModuleV2" | "magneticModuleV1" | "magneticModuleV2" | "thermocyclerModuleV1" | "heaterShakerModuleV1" | "magneticBlockV1" | "absorbanceReaderV1" | "flexStackerModuleV1")[];
-export declare const MODULE_MODELS_OT2_ONLY: ("temperatureModuleV1" | "magneticModuleV1" | "magneticModuleV2" | "thermocyclerModuleV1")[];
+export declare const MODULE_MODELS: ("thermocyclerModuleV2" | "heaterShakerModuleV1" | "temperatureModuleV2" | "magneticBlockV1" | "absorbanceReaderV1" | "flexStackerModuleV1" | "magneticModuleV1" | "magneticModuleV2" | "temperatureModuleV1" | "thermocyclerModuleV1")[];
+export declare const MODULE_MODELS_OT2_ONLY: ("magneticModuleV1" | "magneticModuleV2" | "temperatureModuleV1" | "thermocyclerModuleV1")[];
 export declare const MODULE_TYPES: ("magneticModuleType" | "temperatureModuleType" | "heaterShakerModuleType" | "thermocyclerModuleType" | "magneticBlockType" | "absorbanceReaderType" | "flexStackerModuleType")[];
 export declare const GEN_ONE_MULTI_PIPETTES: string[];
 export declare const IDENTITY_VECTOR: {
@@ -234,7 +235,13 @@ export declare const LOW_VOLUME_PIPETTES: string[];
 export declare const DEFAULT_LIQUID_COLORS: string[];
 export declare const DEPRECATED_WHALE_GREY = "#9395a0";
 export declare const INTERACTIVE_WELL_DATA_ATTRIBUTE = "data-wellname";
-export declare const WELL_TOP: 'well-top';
-export declare const WELL_CENTER: 'well-center';
-export declare const WELL_BOTTOM: 'well-bottom';
-export declare const LIQUID_MENISCUS: 'liquid-meniscus';
+export declare const POSITION_REFERENCE_TOP: 'well-top';
+export declare const POSITION_REFERENCE_BOTTOM: 'well-bottom';
+export declare const POSITION_REFERENCE_CENTER: 'well-center';
+export declare const POSITION_REFERENCE_LIQUID_MENISCUS: 'liquid-meniscus';
+export declare const WELL_ORIGIN_TOP: 'top';
+export declare const WELL_ORIGIN_BOTTOM: 'bottom';
+export declare const WELL_ORIGIN_CENTER: 'center';
+export declare const WELL_ORIGIN_MENISCUS: 'meniscus';
+export declare const POSITION_REFERENCE_MAPPED_TO_WELL_ORIGIN: Record<PositionReference, WellOrigin>;
+export declare const SAFE_MOVE_TO_WELL_OFFSET_FROM_TOP_MM = 2;

package/lib/js/deck/index.d.ts

@@ -1,4 +1,4 @@
-import flexDeckDefV5 from '../../deck/definitions/5/ot3_standard.json';
-import ot2DeckDefV5 from '../../deck/definitions/5/ot2_standard.json';
 import ot2DeckDefShortFixedTrashV5 from '../../deck/definitions/5/ot2_short_trash.json';
+import ot2DeckDefV5 from '../../deck/definitions/5/ot2_standard.json';
+import flexDeckDefV5 from '../../deck/definitions/5/ot3_standard.json';
 export { ot2DeckDefV5, ot2DeckDefShortFixedTrashV5, flexDeckDefV5 };

package/lib/js/fixtures.d.ts

@@ -1,6 +1,6 @@
+import type { ModuleLocation } from '../command';
 import type { AddressableAreaName, CutoutFixtureId, CutoutId, OT2CutoutId } from '../deck';
 import type { AddressableArea, CoordinateTuple, CutoutFixture, DeckDefinition, ModuleModel } from './types';
-import type { ModuleLocation } from '../command';
 export declare function getCutoutDisplayName(cutout: CutoutId): string;
 export declare const OT2_CUTOUT_BY_SLOT_ID: {
     [slotId: string]: OT2CutoutId;

package/lib/js/gripper.d.ts

@@ -1,3 +1,3 @@
-import type { GripperModel, GripperDefinition } from './types';
+import type { GripperDefinition, GripperModel } from './types';
 export declare const getGripperDef: (gripperModel: GripperModel) => GripperDefinition;
 export declare function getGripperDisplayName(gripperModel: GripperModel): string;

package/lib/js/helpers/__tests__/getMmFromBottom.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/js/helpers/__tests__/liquidClasses.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/js/helpers/getLoadedLabwareDefinitionsByUri.d.ts

@@ -1,4 +1,4 @@
-import type { RunTimeCommand, LabwareDefinition2 } from '..';
+import type { LabwareDefinition2, RunTimeCommand } from '..';
 export interface LabwareDefinitionsByUri {
     [defURI: string]: LabwareDefinition2;
 }

package/lib/js/helpers/getMmFromBottom.d.ts

@@ -0,0 +1,2 @@
+import type { PositionReference } from '../types';
+export declare const getMmFromBottom: (zValue: number, reference: PositionReference, wellDepth: number | null) => number | null;

package/lib/js/helpers/getSimplestFlexDeckConfig.d.ts

@@ -1,6 +1,6 @@
 import type { AddressableAreaName, CutoutFixtureId, CutoutId } from '../../deck';
 import type { ProtocolAnalysisOutput } from '../../protocol';
-import type { CutoutConfig, CutoutFixture, DeckDefinition, DeckConfiguration, CompletedProtocolAnalysis, CutoutFixtureGroup } from '../types';
+import type { CompletedProtocolAnalysis, CutoutConfig, CutoutFixture, CutoutFixtureGroup, DeckConfiguration, DeckDefinition } from '../types';
 export interface CutoutConfigProtocolSpec extends CutoutConfig {
     requiredAddressableAreas: AddressableAreaName[];
 }

package/lib/js/helpers/getVectorDifference.d.ts

@@ -1,2 +1,2 @@
-import type { Coordinates } from '../types';
-export declare function getVectorDifference(pointA: Coordinates, pointB: Coordinates): Coordinates;
+import type { Vector3D } from '../types';
+export declare function getVectorDifference(pointA: Vector3D, pointB: Vector3D): Vector3D;

package/lib/js/helpers/getVectorSum.d.ts

@@ -1,2 +1,2 @@
-import type { Coordinates } from '../types';
-export declare function getVectorSum(pointA: Coordinates, pointB: Coordinates): Coordinates;
+import type { Vector3D } from '../types';
+export declare function getVectorSum(pointA: Vector3D, pointB: Vector3D): Vector3D;

package/lib/js/helpers/getWellRangeForLiquidLabwarePair.d.ts

@@ -0,0 +1,6 @@
+export declare function getWellRangeForLiquidLabwarePair(volumeByWell: {
+    [well: string]: number;
+}, labwareWellOrdering: string[][]): Array<{
+    wellName: string;
+    volume: number;
+}>;

package/lib/js/helpers/index.d.ts

@@ -1,5 +1,5 @@
-import type { DeckDefinition, LabwareDefinition2, LabwareDefinition3, LiquidClass, ModuleModel, RobotType, ThermalAdapterName } from '../types';
 import type { CutoutId } from '../../deck/types/schemaV5';
+import type { DeckDefinition, LabwareDefinition2, LabwareDefinition3, LiquidClass, ModuleModel, RobotType, ThermalAdapterName } from '../types';
 export { getWellNamePerMultiTip } from './getWellNamePerMultiTip';
 export { getWellTotalVolume } from './getWellTotalVolume';
 export { wellIsRect } from './wellIsRect';
@@ -12,6 +12,7 @@ export * from './parseProtocolData';
 export * from './volume';
 export * from './wellSets';
 export * from './getAreFlexSlotsAdjacent';
+export * from './getMmFromBottom';
 export * from './getModuleVizDims';
 export * from './getVectorDifference';
 export * from './getVectorSum';
@@ -20,6 +21,7 @@ export * from './getFixedTrashLabwareDefinition';
 export * from './getOccludedSlotCountForModule';
 export * from './labwareInference';
 export * from './linearInterpolate';
+export * from './liquidClasses';
 export * from './getAddressableAreasInProtocol';
 export * from './getFlexSurroundingSlots';
 export * from './getSimplestFlexDeckConfig';
@@ -30,6 +32,7 @@ export * from './orderRuntimeParameterRangeOptions';
 export * from './sortRunTimeParameters';
 export * from './parseAddressableArea';
 export * from './validateCustomLabwareHelper';
+export * from './getWellRangeForLiquidLabwarePair';
 export declare const getLabwareDefIsStandard: (def: LabwareDefinition2) => boolean;
 export declare const getLabwareDefURI: (def: LabwareDefinition2 | LabwareDefinition3) => string;
 export declare const constructLabwareDefURI: (namespace: string, loadName: string, version: string) => string;

package/lib/js/helpers/labwareInference.d.ts

@@ -1,4 +1,4 @@
-import type { LabwareWell, LabwareWellShapeProperties, LabwareDefinition2, LabwareWellGroupMetadata, LabwareBrand } from '../types';
+import type { LabwareBrand, LabwareDefinition2, LabwareWell, LabwareWellGroupMetadata, LabwareWellShapeProperties } from '../types';
 export interface LabwareWellGroupProperties {
     xOffsetFromLeft: number;
     yOffsetFromTop: number;

package/lib/js/helpers/liquidClasses.d.ts

@@ -0,0 +1,8 @@
+import type { PipetteV2Specs } from '..';
+export declare const getCorrectionVolume: (args: {
+    liquidClass: string | null;
+    pipetteSpecs: PipetteV2Specs;
+    tiprackDefUri: string;
+    targetVolume: number;
+    liquidHandlingAction: 'aspirate' | 'singleDispense' | 'multiDispense';
+}) => number;

package/lib/js/helpers/parseAddressableArea.d.ts

@@ -1,4 +1,4 @@
-import type { ModuleModel } from '../types';
 import type { AddressableAreaName } from '../../deck';
+import type { ModuleModel } from '../types';
 export declare function getSlotFromAddressableAreaName(addressableArea: AddressableAreaName): string;
 export declare function getModuleModelFromAddressableArea(addressableArea: AddressableAreaName): ModuleModel | null;

package/lib/js/helpers/parseProtocolCommands.d.ts

@@ -1,6 +1,6 @@
-import type { LoadLabwareRunTimeCommand, LoadModuleRunTimeCommand, RunTimeCommand, LabwareLocation } from '../../command/types';
+import type { LabwareLocation, LoadLabwareRunTimeCommand, LoadModuleRunTimeCommand, RunTimeCommand } from '../../command/types';
 import type { PipetteName } from '../pipettes';
-import type { Liquid, LoadedLabware, LoadedModule, LoadedPipette, ModuleModel, LabwareDefinition2 } from '../types';
+import type { LabwareDefinition2, Liquid, LoadedLabware, LoadedModule, LoadedPipette, ModuleModel } from '../types';
 interface PipetteNamesByMount {
     left: PipetteName | null;
     right: PipetteName | null;

package/lib/js/helpers/validateCustomLabwareHelper.d.ts

@@ -6,4 +6,4 @@ import type { LabwareDefinition2 } from '..';
  * @param definition - a labware definition
  * @returns A boolean for if they exist
  */
-export declare const validateCustomLabwareHelper: (definition: LabwareDefinition2 | null) => boolean;
+export declare const validateCustomLabwareHelper: (definition?: LabwareDefinition2 | null) => boolean;

package/lib/js/labware.d.ts

@@ -1,14 +1,14 @@
-import labwareSchemaV2 from '../labware/schemas/2.json';
-import fixture96Plate from '../labware/fixtures/2/fixture_96_plate.json';
 import fixture12Trough from '../labware/fixtures/2/fixture_12_trough.json';
 import fixture24Tuberack from '../labware/fixtures/2/fixture_24_tuberack.json';
-import fixtureTiprack10ul from '../labware/fixtures/2/fixture_tiprack_10_ul.json';
-import fixtureTiprack300ul from '../labware/fixtures/2/fixture_tiprack_300_ul.json';
+import fixture96Plate from '../labware/fixtures/2/fixture_96_plate.json';
+import fixture384Plate from '../labware/fixtures/2/fixture_384_plate.json';
+import fixtureCalibrationBlock from '../labware/fixtures/2/fixture_calibration_block.json';
 import fixtureTiprack1000ul from '../labware/fixtures/2/fixture_flex_96_tiprack_1000ul.json';
 import fixtureTiprackAdapter from '../labware/fixtures/2/fixture_flex_96_tiprack_adapter.json';
-import fixtureCalibrationBlock from '../labware/fixtures/2/fixture_calibration_block.json';
-import fixture384Plate from '../labware/fixtures/2/fixture_384_plate.json';
+import fixtureTiprack10ul from '../labware/fixtures/2/fixture_tiprack_10_ul.json';
+import fixtureTiprack300ul from '../labware/fixtures/2/fixture_tiprack_300_ul.json';
 import fixtureTrash from '../labware/fixtures/2/fixture_trash.json';
+import labwareSchemaV2 from '../labware/schemas/2.json';
 import type { LabwareDefByDefURI, LabwareDefinition2, LegacyLabwareDefByName } from './types';
 export declare const getAllLabwareDefs: () => Record<string, LabwareDefinition2>;
 export declare function getAllDefinitions(blockList?: string[]): LabwareDefByDefURI;

package/lib/js/labwareTools/index.d.ts

@@ -1,4 +1,4 @@
-import type { LabwareDefinition2 as Definition, LabwareMetadata as Metadata, LabwareDimensions as Dimensions, LabwareBrand as Brand, LabwareParameters as Params, LabwareWell as Well, LabwareWellProperties as InputWell, LabwareWellGroup as WellGroup, LabwareOffset as Offset, LabwareVolumeUnits as VolumeUnits, ModuleModel, LabwareOffset } from '../types';
+import type { LabwareBrand as Brand, LabwareDefinition2 as Definition, LabwareDimensions as Dimensions, LabwareWellProperties as InputWell, LabwareOffset, LabwareMetadata as Metadata, ModuleModel, LabwareOffset as Offset, LabwareParameters as Params, LabwareVolumeUnits as VolumeUnits, LabwareWell as Well, LabwareWellGroup as WellGroup } from '../types';
 export declare const DEFAULT_CUSTOM_NAMESPACE = "custom_beta";
 interface Cell {
     row: number;

package/lib/js/modules.d.ts

@@ -1,4 +1,4 @@
-import type { ModuleModel, ModuleModelWithLegacy, ModuleType, ModuleDefinition } from './types';
+import type { ModuleDefinition, ModuleModel, ModuleModelWithLegacy, ModuleType } from './types';
 export declare const getModuleDef2: (moduleModel: ModuleModel) => ModuleDefinition;
 export declare function normalizeModuleModel(legacyModule: ModuleModelWithLegacy): ModuleModel;
 export declare function getModuleType(moduleModel: ModuleModel): ModuleType;

package/lib/js/pipettes.d.ts

@@ -1,6 +1,6 @@
-import pipetteNameSpecs from '../pipette/definitions/1/pipetteNameSpecs.json';
 import pipetteModelSpecs from '../pipette/definitions/1/pipetteModelSpecs.json';
-import type { PipetteV2Specs, PipetteNameSpecs, PipetteModelSpecs } from './types';
+import pipetteNameSpecs from '../pipette/definitions/1/pipetteNameSpecs.json';
+import type { PipetteModelSpecs, PipetteNameSpecs, PipetteV2Specs } from './types';
 type SortableProps = 'maxVolume' | 'channels';
 export type PipetteName = keyof typeof pipetteNameSpecs;
 export type PipetteModel = keyof typeof pipetteModelSpecs.config;
@@ -13,3 +13,4 @@ export declare const getIncompatiblePipetteNames: (currentPipette: PipetteName)
 export * from '../pipette/fixtures/name';
 export * from '../pipette/fixtures/index';
 export declare const getPipetteSpecsV2: (name?: PipetteName | PipetteModel) => PipetteV2Specs | null;
+export declare const getFlexNameConversion: (pipetteSpec: PipetteV2Specs) => string;

package/lib/js/types.d.ts

@@ -1,8 +1,8 @@
-import type { MAGDECK, TEMPDECK, THERMOCYCLER, MAGNETIC_MODULE_V1, MAGNETIC_MODULE_V2, TEMPERATURE_MODULE_V1, TEMPERATURE_MODULE_V2, THERMOCYCLER_MODULE_V1, THERMOCYCLER_MODULE_V2, HEATERSHAKER_MODULE_V1, ABSORBANCE_READER_V1, MAGNETIC_MODULE_TYPE, TEMPERATURE_MODULE_TYPE, THERMOCYCLER_MODULE_TYPE, HEATERSHAKER_MODULE_TYPE, MAGNETIC_BLOCK_TYPE, ABSORBANCE_READER_TYPE, GEN1, GEN2, FLEX, LEFT, RIGHT, GRIPPER_V1, GRIPPER_V1_1, GRIPPER_V1_2, GRIPPER_V1_3, EXTENSION, MAGNETIC_BLOCK_V1, FLEX_STACKER_MODULE_V1, FLEX_STACKER_MODULE_TYPE, WELL_BOTTOM, WELL_CENTER, WELL_TOP, LIQUID_MENISCUS } from './constants';
-import type { RunTimeCommand, LoadedLabwareLocation } from '../command/types';
+import type { LoadedLabwareLocation, RunTimeCommand } from '../command/types';
+import type { CommandAnnotation } from '../commandAnnotation/types';
 import type { AddressableAreaName, CutoutFixtureId, CutoutId } from '../deck';
+import type { ABSORBANCE_READER_TYPE, ABSORBANCE_READER_V1, EXTENSION, FLEX, FLEX_STACKER_MODULE_TYPE, FLEX_STACKER_MODULE_V1, GEN1, GEN2, GRIPPER_V1, GRIPPER_V1_1, GRIPPER_V1_2, GRIPPER_V1_3, HEATERSHAKER_MODULE_TYPE, HEATERSHAKER_MODULE_V1, LEFT, MAGDECK, MAGNETIC_BLOCK_TYPE, MAGNETIC_BLOCK_V1, MAGNETIC_MODULE_TYPE, MAGNETIC_MODULE_V1, MAGNETIC_MODULE_V2, POSITION_REFERENCE_BOTTOM, POSITION_REFERENCE_CENTER, POSITION_REFERENCE_LIQUID_MENISCUS, POSITION_REFERENCE_TOP, RIGHT, TEMPDECK, TEMPERATURE_MODULE_TYPE, TEMPERATURE_MODULE_V1, TEMPERATURE_MODULE_V2, THERMOCYCLER, THERMOCYCLER_MODULE_TYPE, THERMOCYCLER_MODULE_V1, THERMOCYCLER_MODULE_V2 } from './constants';
 import type { PipetteName } from './pipettes';
-import type { CommandAnnotation } from '../commandAnnotation/types';
 export type RobotType = 'OT-2 Standard' | 'OT-3 Standard';
 export interface RobotDefinition {
     displayName: string;
@@ -51,12 +51,16 @@ export interface LabwareDimensions {
     yDimension: number;
     zDimension: number;
 }
-export interface Coordinates {
+export interface Vector2D {
+    x: number;
+    y: number;
+}
+export interface Vector3D {
     x: number;
     y: number;
     z: number;
 }
-export type LabwareOffset = Coordinates;
+export type LabwareOffset = Vector3D;
 export interface LabwareParameters {
     loadName: string;
     format: string;
@@ -147,6 +151,18 @@ export interface LabwareWellGroup {
     metadata: LabwareWellGroupMetadata;
     brand?: LabwareBrand;
 }
+export interface AxisAlignedBoundingBox2D {
+    backLeft: Vector2D;
+    frontRight: Vector2D;
+}
+export interface AxisAlignedBoundingBox3D {
+    backLeftBottom: Vector3D;
+    frontRightTop: Vector3D;
+}
+export interface Extents {
+    total: AxisAlignedBoundingBox3D;
+    footprint: AxisAlignedBoundingBox2D;
+}
 export type LabwareRoles = 'labware' | 'adapter' | 'fixture' | 'maintenance' | 'lid' | 'system';
 export interface LabwareDefinition2 {
     version: number;
@@ -173,8 +189,7 @@ export interface LabwareDefinition3 {
     schemaVersion: 3;
     namespace: string;
     metadata: LabwareMetadata;
-    dimensions: LabwareDimensions;
-    cornerOffsetFromSlot: LabwareOffset;
+    extents: Extents;
     parameters: LabwareParameters;
     brand: LabwareBrand;
     ordering: string[][];
@@ -308,9 +323,9 @@ export interface ModuleLayer {
 export interface ModuleDefinition {
     moduleType: ModuleType;
     model: ModuleModel;
-    labwareOffset: Coordinates;
+    labwareOffset: Vector3D;
     dimensions: ModuleDimensions;
-    cornerOffsetFromSlot: Coordinates;
+    cornerOffsetFromSlot: Vector3D;
     calibrationPoint: ModuleCalibrationPoint;
     displayName: string;
     quirks: string[];
@@ -538,22 +553,26 @@ export interface Liquid {
     description: string;
     displayColor?: string;
 }
-type LiquidHandlingPropertyByVolume = number[][];
-export type PositionReference = typeof WELL_BOTTOM | typeof WELL_CENTER | typeof WELL_TOP | typeof LIQUID_MENISCUS;
+export type LiquidHandlingPropertyByVolume = number[][];
+export type PositionReference = typeof POSITION_REFERENCE_BOTTOM | typeof POSITION_REFERENCE_CENTER | typeof POSITION_REFERENCE_TOP | typeof POSITION_REFERENCE_LIQUID_MENISCUS;
 type BlowoutLocation = 'source' | 'destination' | 'trash';
 interface DelayParams {
     duration: number;
 }
-interface DelayProperties {
+export interface TipPosition {
+    positionReference: PositionReference;
+    offset: Vector3D;
+}
+export interface DelayProperties {
     enable: boolean;
     params?: DelayParams;
 }
 interface TouchTipParams {
     zOffset: number;
-    mmToEdge: number;
+    mmFromEdge: number;
     speed: number;
 }
-interface TouchTipProperties {
+export interface TouchTipProperties {
     enable: boolean;
     params?: TouchTipParams;
 }
@@ -561,7 +580,7 @@ interface MixParams {
     repetitions: number;
     volume: number;
 }
-interface MixProperties {
+export interface MixProperties {
     enable: boolean;
     params?: MixParams;
 }
@@ -569,50 +588,49 @@ interface BlowoutParams {
     location: BlowoutLocation;
     flowRate: number;
 }
-interface BlowoutProperties {
+export interface BlowoutProperties {
     enable: boolean;
     params?: BlowoutParams;
 }
-interface Submerge {
-    positionReference: PositionReference;
-    offset: Coordinates;
+export interface Submerge {
+    startPosition: TipPosition;
     speed: number;
     delay: DelayProperties;
 }
 interface BaseRetract {
-    positionReference: PositionReference;
-    offset: Coordinates;
+    endPosition: TipPosition;
     speed: number;
     airGapByVolume: LiquidHandlingPropertyByVolume;
     touchTip: TouchTipProperties;
     delay: DelayProperties;
 }
-type RetractAspirate = BaseRetract;
-interface RetractDispense extends BaseRetract {
+export type RetractAspirate = BaseRetract;
+export interface RetractDispense extends BaseRetract {
     blowout: BlowoutProperties;
 }
 interface BaseLiquidHandlingProperties<RetractType> {
     submerge: Submerge;
     retract: RetractType;
-    positionReference: PositionReference;
-    offset: Coordinates;
     flowRateByVolume: LiquidHandlingPropertyByVolume;
     correctionByVolume: LiquidHandlingPropertyByVolume;
     delay: DelayProperties;
 }
 export interface AspirateProperties extends BaseLiquidHandlingProperties<RetractAspirate> {
+    aspiratePosition: TipPosition;
     preWet: boolean;
     mix: MixProperties;
 }
 export interface SingleDispenseProperties extends BaseLiquidHandlingProperties<RetractDispense> {
+    dispensePosition: TipPosition;
     mix: MixProperties;
     pushOutByVolume: LiquidHandlingPropertyByVolume;
 }
-export interface MultiDispenseProperties {
+export interface MultiDispenseProperties extends BaseLiquidHandlingProperties<RetractDispense> {
+    dispensePosition: TipPosition;
     conditioningByVolume: LiquidHandlingPropertyByVolume;
     disposalByVolume: LiquidHandlingPropertyByVolume;
 }
-interface ByTipTypeSetting {
+export interface ByTipTypeSetting {
     tiprack: string;
     aspirate: AspirateProperties;
     singleDispense: SingleDispenseProperties;

package/lib/labware/definitions/2/agilent_1_reservoir_290ml/3.json

@@ -0,0 +1,80 @@
+{
+    "ordering": [["A1"]],
+    "brand": {
+        "brand": "Agilent",
+        "brandId": ["201252-100"],
+        "links": ["https://www.agilent.com/store/en_US/Prod-201252-100/201252-100"]
+    },
+    "metadata": {
+        "displayName": "Agilent 1 Well Reservoir 290 mL",
+        "displayCategory": "reservoir",
+        "displayVolumeUnits": "mL",
+        "tags": []
+    },
+    "dimensions": {
+        "xDimension": 127.76,
+        "yDimension": 85.57,
+        "zDimension": 44.04
+    },
+    "wells": {
+        "A1": {
+            "depth": 39.23,
+            "shape": "rectangular",
+            "xDimension": 108,
+            "yDimension": 72,
+            "totalLiquidVolume": 290000,
+            "x": 63.88,
+            "y": 42.785,
+            "z": 4.81,
+            "geometryDefinitionId": "cuboidalWell"
+        }
+    },
+    "groups": [
+        {
+            "wells": ["A1"],
+            "metadata": {
+                "wellBottomShape": "v"
+            }
+        }
+    ],
+    "parameters": {
+        "format": "trough",
+        "isTiprack": false,
+        "isMagneticModuleCompatible": false,
+        "loadName": "agilent_1_reservoir_290ml",
+        "quirks": ["centerMultichannelOnWells", "touchTipDisabled"]
+    },
+    "namespace": "opentrons",
+    "version": 3,
+    "schemaVersion": 2,
+    "cornerOffsetFromSlot": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+    },
+    "innerLabwareGeometry": {
+        "cuboidalWell": {
+            "sections": [
+                {
+                    "shape": "cuboidal",
+                    "topXDimension": 107.5,
+                    "topYDimension": 71.25,
+                    "bottomXDimension": 106.785,
+                    "bottomYDimension": 71.0,
+                    "topHeight": 39.23,
+                    "bottomHeight": 2.0
+                },
+                {
+                    "shape": "cuboidal",
+                    "topXDimension": 106.785,
+                    "topYDimension": 8,
+                    "bottomXDimension": 100.75,
+                    "bottomYDimension": 1.66,
+                    "topHeight": 2,
+                    "bottomHeight": 0,
+                    "yCount": 8
+                }
+            ]
+        }
+    }
+}