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

package/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json

@@ -4,12 +4,12 @@
     "t20": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {
-        "default": 35,
-        "valuesByApiLevel": { "2.14": 35 }
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
       },
       "defaultDispenseFlowRate": {
-        "default": 57,
-        "valuesByApiLevel": { "2.14": 57 }
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
       },
       "defaultBlowOutFlowRate": {
         "default": 57,
@@ -64,7 +64,7 @@
           ]
         }
       },
-      "defaultPushOutVolume": 2
+      "defaultPushOutVolume": 3.5
     },
     "t50": {
       "uiMaxFlowRate": 57,

package/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json

@@ -4,12 +4,12 @@
     "t20": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {
-        "default": 26.7,
-        "valuesByApiLevel": { "2.14": 26.7 }
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
       },
       "defaultDispenseFlowRate": {
-        "default": 26.7,
-        "valuesByApiLevel": { "2.14": 26.7 }
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
       },
       "defaultBlowOutFlowRate": {
         "default": 26.7,
@@ -62,7 +62,7 @@
           ]
         }
       },
-      "defaultPushOutVolume": 7
+      "defaultPushOutVolume": 3.5
     },
     "t50": {
       "uiMaxFlowRate": 26.7,

package/pipette/fixtures/index.ts

@@ -1,20 +1,20 @@
-import fixtureP10SingleGeneral from '../../pipette/definitions/2/general/single_channel/p10/1_0.json'
-import fixtureP10SingleGeometry from '../../pipette/definitions/2/geometry/single_channel/p10/1_0.json'
-import fixturep10SingleLiquids from '../../pipette/definitions/2/liquid/single_channel/p10/default/1_0.json'
 import fixtureP10MultiGeneral from '../../pipette/definitions/2/general/eight_channel/p10/1_0.json'
-import fixtureP10MultiGeometry from '../../pipette/definitions/2/geometry/eight_channel/p10/1_0.json'
-import fixtureP10MultiLiquids from '../../pipette/definitions/2/liquid/eight_channel/p10/default/1_0.json'
-import fixtureP300SingleGeneral from '../../pipette/definitions/2/general/single_channel/p300/1_0.json'
-import fixtureP300SingleGeometry from '../../pipette/definitions/2/geometry/single_channel/p300/1_0.json'
-import fixtureP300SingleLiquids from '../../pipette/definitions/2/liquid/single_channel/p300/default/1_0.json'
 import fixtureP300MultiGeneral from '../../pipette/definitions/2/general/eight_channel/p300/1_0.json'
-import fixtureP300MultiGeometry from '../../pipette/definitions/2/geometry/eight_channel/p300/1_0.json'
-import fixtureP300MultiLiquids from '../../pipette/definitions/2/liquid/eight_channel/p300/default/1_0.json'
 import fixtureP100096General from '../../pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json'
-import fixtureP100096Geometry from '../../pipette/definitions/2/geometry/ninety_six_channel/p1000/1_0.json'
-import fixtureP100096Liquids from '../../pipette/definitions/2/liquid/ninety_six_channel/p1000/default/1_0.json'
+import fixtureP10SingleGeneral from '../../pipette/definitions/2/general/single_channel/p10/1_0.json'
+import fixtureP300SingleGeneral from '../../pipette/definitions/2/general/single_channel/p300/1_0.json'
 import fixtureP1000SingleGeneral from '../../pipette/definitions/2/general/single_channel/p1000/1_0.json'
+import fixtureP10MultiGeometry from '../../pipette/definitions/2/geometry/eight_channel/p10/1_0.json'
+import fixtureP300MultiGeometry from '../../pipette/definitions/2/geometry/eight_channel/p300/1_0.json'
+import fixtureP100096Geometry from '../../pipette/definitions/2/geometry/ninety_six_channel/p1000/1_0.json'
+import fixtureP10SingleGeometry from '../../pipette/definitions/2/geometry/single_channel/p10/1_0.json'
+import fixtureP300SingleGeometry from '../../pipette/definitions/2/geometry/single_channel/p300/1_0.json'
 import fixtureP1000SingleGeometry from '../../pipette/definitions/2/geometry/single_channel/p1000/1_0.json'
+import fixtureP10MultiLiquids from '../../pipette/definitions/2/liquid/eight_channel/p10/default/1_0.json'
+import fixtureP300MultiLiquids from '../../pipette/definitions/2/liquid/eight_channel/p300/default/1_0.json'
+import fixtureP100096Liquids from '../../pipette/definitions/2/liquid/ninety_six_channel/p1000/default/1_0.json'
+import fixturep10SingleLiquids from '../../pipette/definitions/2/liquid/single_channel/p10/default/1_0.json'
+import fixtureP300SingleLiquids from '../../pipette/definitions/2/liquid/single_channel/p300/default/1_0.json'
 import fixtureP1000SingleLiquids from '../../pipette/definitions/2/liquid/single_channel/p1000/default/1_0.json'
 
 import type { PipetteV2Specs } from '../../js'

package/pipette/fixtures/name/index.ts

@@ -1,4 +1,5 @@
 import _pipetteNameSpecFixtures from './pipetteNameSpecFixtures.json'
+
 import type { PipetteName, PipetteNameSpecs } from '../../../js'
 
 export const pipetteNameSpecFixtures = _pipetteNameSpecFixtures as Record<

package/protocol/fixtures/index.ts

@@ -1,3 +1,5 @@
+import simple_v4 from './4/simpleV4.json'
+import test_modules_protocol from './4/testModulesProtocol.json'
 import heater_shaker_commands from './6/heaterShakerCommands.json'
 import heater_shaker_commands_with_results_key from './6/heaterShakerCommandsWithResultsKey.json'
 import multiple_temp_modules from './6/multipleTempModules.json'
@@ -8,9 +10,6 @@ import simple_v6 from './6/simpleV6.json'
 import temp_and_mag_module_commands from './6/tempAndMagModuleCommands.json'
 import transfer_settings from './6/transferSettings.json'
 
-import simple_v4 from './4/simpleV4.json'
-import test_modules_protocol from './4/testModulesProtocol.json'
-
 export {
   heater_shaker_commands,
   heater_shaker_commands_with_results_key,

package/protocol/index.ts

@@ -1,3 +1,12 @@
+import protocolSchemaV1 from './schemas/1.json'
+import protocolSchemaV2 from './schemas/2.json'
+import protocolSchemaV3 from './schemas/3.json'
+import protocolSchemaV4 from './schemas/4.json'
+import protocolSchemaV5 from './schemas/5.json'
+import protocolSchemaV6 from './schemas/6.json'
+import protocolSchemaV7 from './schemas/7.json'
+import protocolSchemaV8 from './schemas/8.json'
+
 import type { ProtocolFile as ProtocolFileV1 } from './types/schemaV1'
 import type { ProtocolFile as ProtocolFileV3 } from './types/schemaV3'
 import type { ProtocolFile as ProtocolFileV4 } from './types/schemaV4'
@@ -8,14 +17,6 @@ import type {
   ProtocolFile as ProtocolFileV8,
   ProtocolStructure as ProtocolStructureV8,
 } from './types/schemaV8'
-import protocolSchemaV1 from './schemas/1.json'
-import protocolSchemaV2 from './schemas/2.json'
-import protocolSchemaV3 from './schemas/3.json'
-import protocolSchemaV4 from './schemas/4.json'
-import protocolSchemaV5 from './schemas/5.json'
-import protocolSchemaV6 from './schemas/6.json'
-import protocolSchemaV7 from './schemas/7.json'
-import protocolSchemaV8 from './schemas/8.json'
 
 export type {
   ProtocolFileV1,

package/protocol/types/schemaV4.ts

@@ -1,12 +1,12 @@
 import type { DeckSlotId, ModuleModel } from '../../js/types'
 import type {
-  ProtocolFile as V3ProtocolFile,
   AspDispAirgapParams,
   BlowoutParams,
-  TouchTipParams,
-  PipetteAccessParams,
-  MoveToSlotParams,
   DelayParams,
+  MoveToSlotParams,
+  PipetteAccessParams,
+  TouchTipParams,
+  ProtocolFile as V3ProtocolFile,
 } from './schemaV3'
 
 export type { BlowoutParams, FilePipette, FileLabware } from './schemaV3'

package/protocol/types/schemaV5.ts

@@ -1,5 +1,5 @@
 import type { ProtocolFile as V3ProtocolFile } from './schemaV3'
-import type { Command as V4Command, FileModule } from './schemaV4'
+import type { FileModule, Command as V4Command } from './schemaV4'
 
 export interface MoveToWellParams {
   pipette: string

package/protocol/types/schemaV5Addendum.ts

@@ -5,7 +5,7 @@
  * can be phased out as the two are updated to the V6 schema support.
  */
 
-import type { ProtocolFile as V3ProtocolFile, AirGapParams } from './schemaV3'
+import type { AirGapParams, ProtocolFile as V3ProtocolFile } from './schemaV3'
 import type { FileModule } from './schemaV4'
 import type { Command as V5Command } from './schemaV5'
 

package/protocol/types/schemaV6/command/gantry.ts

@@ -1,5 +1,5 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
-import type { MotorAxis, Coordinates, MotorAxes } from '../../../../js/types'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
+import type { MotorAxes, MotorAxis, Vector3D } from '../../../../js/types'
 
 export interface MoveToSlotCreateCommand extends CommonCommandCreateInfo {
   commandType: 'moveToSlot'
@@ -37,7 +37,7 @@ export interface MoveRelativeRunTimeCommand
   extends CommonCommandRunTimeInfo,
     MoveRelativeCreateCommand {
   result?: {
-    position: Coordinates
+    position: Vector3D
   }
 }
 export interface SavePositionCreateCommand extends CommonCommandCreateInfo {
@@ -49,7 +49,7 @@ export interface SavePositionRunTimeCommand
     SavePositionCreateCommand {
   result?: {
     positionId: string
-    position: Coordinates
+    position: Vector3D
   }
 }
 export interface HomeCreateCommand extends CommonCommandCreateInfo {

package/protocol/types/schemaV6/command/index.ts

@@ -1,12 +1,12 @@
+import type { CommandIntent } from '../../../../command'
+import type { GantryCreateCommand, GantryRunTimeCommand } from './gantry'
+import type { ModuleCreateCommand, ModuleRunTimeCommand } from './module'
 import type {
-  PipettingRunTimeCommand,
   PipettingCreateCommand,
+  PipettingRunTimeCommand,
 } from './pipetting'
-import type { GantryRunTimeCommand, GantryCreateCommand } from './gantry'
-import type { ModuleRunTimeCommand, ModuleCreateCommand } from './module'
-import type { SetupRunTimeCommand, SetupCreateCommand } from './setup'
-import type { TimingRunTimeCommand, TimingCreateCommand } from './timing'
-import type { CommandIntent } from '../../../../command'
+import type { SetupCreateCommand, SetupRunTimeCommand } from './setup'
+import type { TimingCreateCommand, TimingRunTimeCommand } from './timing'
 
 export * from './pipetting'
 export * from './gantry'

package/protocol/types/schemaV6/command/module.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 
 export type ModuleRunTimeCommand =
   | MagneticModuleEngageMagnetRunTimeCommand

package/protocol/types/schemaV6/command/pipetting.ts

@@ -1,4 +1,5 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
+
 export type PipettingRunTimeCommand =
   | AspirateRunTimeCommand
   | DispenseRunTimeCommand

package/protocol/types/schemaV6/command/setup.ts

@@ -1,10 +1,10 @@
 import type {
-  CommonCommandRunTimeInfo,
   CommonCommandCreateInfo,
+  CommonCommandRunTimeInfo,
   LabwareDefinition2,
   LabwareOffset,
-  PipetteName,
   ModuleModel,
+  PipetteName,
 } from '../../../../js'
 
 export interface LoadPipetteCreateCommand extends CommonCommandCreateInfo {

package/protocol/types/schemaV6/command/timing.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 
 export type TimingCreateCommand =
   | WaitForResumeCreateCommand

package/protocol/types/schemaV6/index.ts

@@ -1,16 +1,16 @@
 import type {
-  LoadedPipette,
+  Liquid,
   LoadedLabware,
   LoadedModule,
-  Liquid,
+  LoadedPipette,
   PipetteName,
 } from '../../../js'
-import type { CreateCommand, RunTimeCommand } from './command'
 import type {
   LabwareDefinition2,
   ModuleModel,
   RobotType,
 } from '../../../js/types'
+import type { CreateCommand, RunTimeCommand } from './command'
 
 export * from './command'
 

package/protocol/types/schemaV7/command/annotation.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 
 export type AnnotationCreateCommand = CommentCreateCommand | CustomCreateCommand
 

package/protocol/types/schemaV7/command/calibration.ts

@@ -1,10 +1,11 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 import type {
-  PipetteMount,
   GantryMount,
   LabwareOffset,
-  Coordinates,
+  PipetteMount,
+  Vector3D,
 } from '../../../../js/types'
+
 // TODO (sb 10/26/22): Separate out calibration commands from protocol schema in RAUT-272
 export interface CalibratePipetteCreateCommand extends CommonCommandCreateInfo {
   commandType: 'calibration/calibratePipette'
@@ -62,7 +63,7 @@ interface CalibratePipetteParams {
 }
 interface CalibrateGripperParams {
   jaw: 'front' | 'rear'
-  otherJawOffset?: Coordinates
+  otherJawOffset?: Vector3D
 }
 interface CalibrateModuleParams {
   moduleId: string
@@ -73,12 +74,12 @@ interface CalibratePipetteResult {
   pipetteOffset: LabwareOffset
 }
 interface CalibrateGripperResult {
-  jawOffset: Coordinates
+  jawOffset: Vector3D
 }
 interface MoveToMaintenancePositionParams {
   mount: GantryMount
   maintenancePosition?: 'attachPlate' | 'attachInstrument'
 }
 interface CalibrateModuleResult {
-  moduleOffset: Coordinates
+  moduleOffset: Vector3D
 }

package/protocol/types/schemaV7/command/gantry.ts

@@ -1,9 +1,9 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 import type {
-  Coordinates,
+  GantryMount,
   MotorAxes,
   MotorAxis,
-  GantryMount,
+  Vector3D,
 } from '../../../../js/types'
 
 export interface MoveToSlotCreateCommand extends CommonCommandCreateInfo {
@@ -42,7 +42,7 @@ export interface MoveRelativeRunTimeCommand
   extends CommonCommandRunTimeInfo,
     MoveRelativeCreateCommand {
   result?: {
-    position: Coordinates
+    position: Vector3D
   }
 }
 export interface SavePositionCreateCommand extends CommonCommandCreateInfo {
@@ -54,7 +54,7 @@ export interface SavePositionRunTimeCommand
     SavePositionCreateCommand {
   result?: {
     positionId: string
-    position: Coordinates
+    position: Vector3D
   }
 }
 export interface HomeCreateCommand extends CommonCommandCreateInfo {

package/protocol/types/schemaV7/command/incidental.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 import type { StatusBarAnimation } from '../../../../js/types'
 
 export type IncidentalCreateCommand = SetStatusBarCreateCommand

package/protocol/types/schemaV7/command/index.ts

@@ -1,23 +1,23 @@
 import type {
-  PipettingRunTimeCommand,
-  PipettingCreateCommand,
-} from './pipetting'
-import type { GantryRunTimeCommand, GantryCreateCommand } from './gantry'
-import type { ModuleRunTimeCommand, ModuleCreateCommand } from './module'
-import type { SetupRunTimeCommand, SetupCreateCommand } from './setup'
-import type { TimingRunTimeCommand, TimingCreateCommand } from './timing'
-import type {
-  IncidentalCreateCommand,
-  IncidentalRunTimeCommand,
-} from './incidental'
-import type {
-  AnnotationRunTimeCommand,
   AnnotationCreateCommand,
+  AnnotationRunTimeCommand,
 } from './annotation'
 import type {
-  CalibrationRunTimeCommand,
   CalibrationCreateCommand,
+  CalibrationRunTimeCommand,
 } from './calibration'
+import type { GantryCreateCommand, GantryRunTimeCommand } from './gantry'
+import type {
+  IncidentalCreateCommand,
+  IncidentalRunTimeCommand,
+} from './incidental'
+import type { ModuleCreateCommand, ModuleRunTimeCommand } from './module'
+import type {
+  PipettingCreateCommand,
+  PipettingRunTimeCommand,
+} from './pipetting'
+import type { SetupCreateCommand, SetupRunTimeCommand } from './setup'
+import type { TimingCreateCommand, TimingRunTimeCommand } from './timing'
 
 export * from './annotation'
 export * from './calibration'

package/protocol/types/schemaV7/command/module.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 
 export type ModuleRunTimeCommand =
   | MagneticModuleEngageMagnetRunTimeCommand

package/protocol/types/schemaV7/command/pipetting.ts

@@ -1,4 +1,5 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
+
 export type PipettingRunTimeCommand =
   | AspirateRunTimeCommand
   | DispenseRunTimeCommand

package/protocol/types/schemaV7/command/setup.ts

@@ -1,10 +1,10 @@
 import type {
-  CommonCommandRunTimeInfo,
   CommonCommandCreateInfo,
+  CommonCommandRunTimeInfo,
   LabwareDefinition2,
   LabwareOffset,
-  PipetteName,
   ModuleModel,
+  PipetteName,
 } from '../../../../js'
 
 export interface LoadPipetteCreateCommand extends CommonCommandCreateInfo {

package/protocol/types/schemaV7/command/timing.ts

@@ -1,4 +1,4 @@
-import type { CommonCommandRunTimeInfo, CommonCommandCreateInfo } from '.'
+import type { CommonCommandCreateInfo, CommonCommandRunTimeInfo } from '.'
 
 export type TimingCreateCommand =
   | WaitForResumeCreateCommand

package/protocol/types/schemaV7/index.ts

@@ -1,11 +1,11 @@
 import type {
-  LoadedPipette,
+  Liquid,
   LoadedLabware,
   LoadedModule,
-  Liquid,
+  LoadedPipette,
 } from '../../../js'
-import type { CreateCommand, RunTimeCommand } from './command'
 import type { LabwareDefinition2, RobotType } from '../../../js/types'
+import type { CreateCommand, RunTimeCommand } from './command'
 
 export * from './command'
 

package/protocol/types/schemaV8/index.ts

@@ -1,12 +1,12 @@
 import type { CreateCommand } from '../../../command/types'
+import type { CommandAnnotation } from '../../../commandAnnotation/types'
 import type {
-  LoadedPipette,
+  Liquid,
   LoadedLabware,
   LoadedModule,
-  Liquid,
+  LoadedPipette,
   RunTimeParameter,
 } from '../../../js'
-import type { CommandAnnotation } from '../../../commandAnnotation/types'
 import type { LabwareDefinition2, RobotType } from '../../../js/types'
 import type { RunTimeCommand } from '../schemaV8'