@opentrons/shared-data 0.1.6-alpha.9 → 0.1.7-alpha.1

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'
 
@@ -27,6 +27,11 @@ export interface CommandV9Mixin {
   commands: CreateCommand[]
 }
 
+export interface CommandV10Mixin {
+  commandSchemaId: 'opentronsCommandSchemaV10'
+  commands: CreateCommand[]
+}
+
 export interface CommandAnnotationsStructure {
   commandAnnotationSchemaId: string
   commandAnnotations: any[]
@@ -100,6 +105,7 @@ export interface ProtocolBase<DesignerApplicationData> {
     category?: string | null | undefined
     subcategory?: string | null | undefined
     tags?: string[]
+    source?: string | null
   }
   designerApplication?: {
     name?: string
@@ -115,7 +121,7 @@ export type ProtocolFile<
   (OT2RobotMixin | OT3RobotMixin) &
   LabwareV2Mixin &
   LiquidV1Mixin &
-  (CommandV8Mixin | CommandV9Mixin) &
+  (CommandV8Mixin | CommandV9Mixin | CommandV10Mixin) &
   CommandAnnotationV1Mixin
 
 export type ProtocolStructure = ProtocolBase<{}> &
@@ -144,6 +150,7 @@ export interface ProtocolAnalysisOutput {
   errors: AnalysisError[]
   runTimeParameters: RunTimeParameter[]
   robotType?: RobotType
+  commandAnnotations?: CommandAnnotation[]
   result: 'ok' | 'not-ok' | 'error' | 'parameter-value-required'
 }
 

package/robot/definitions/1/ot3.json

@@ -4,7 +4,7 @@
   "models": ["OT-3 Standard"],
   "extents": [477.2, 493.8, 0.0],
   "paddingOffsets": {
-    "rear": -177.42,
+    "rear": -169.42,
     "front": 51.8,
     "leftSide": 31.88,
     "rightSide": -80.32

package/tsconfig-data.json

@@ -12,6 +12,7 @@
     "deck/**/*.json",
     "labware/**/*.json",
     "liquid/**/*.json",
+    "liquid-class/**/*.json",
     "command/**/*.json",
     "commandAnnotation/**/*.json",
     "gripper/**/*.json",

package/tsconfig.json

@@ -18,6 +18,7 @@
     "command",
     "errors",
     "liquid/types",
+    "liquid-class",
     "commandAnnotation/types",
     "vite.config.mts"
   ]

package/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic/2.json

@@ -1,230 +0,0 @@
-{
-  "wells": {
-    "A1": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 19,
-      "y": 74,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "B1": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 19,
-      "y": 42.5,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "C1": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 19,
-      "y": 11,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "A2": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 42,
-      "y": 74,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "B2": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 42,
-      "y": 42.5,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "C2": {
-      "totalLiquidVolume": 15000,
-      "diameter": 14.9,
-      "shape": "circular",
-      "depth": 117.98,
-      "x": 42,
-      "y": 11,
-      "z": 5.78,
-      "geometryDefinitionId": "15mlconicalWell"
-    },
-    "A3": {
-      "totalLiquidVolume": 50000,
-      "diameter": 27.81,
-      "shape": "circular",
-      "depth": 113.85,
-      "x": 70.2,
-      "y": 62.2,
-      "z": 5.95,
-      "geometryDefinitionId": "50mlconicalWell"
-    },
-    "B3": {
-      "totalLiquidVolume": 50000,
-      "diameter": 27.81,
-      "shape": "circular",
-      "depth": 113.85,
-      "x": 70.2,
-      "y": 16.8,
-      "z": 5.95,
-      "geometryDefinitionId": "50mlconicalWell"
-    },
-    "A4": {
-      "totalLiquidVolume": 50000,
-      "diameter": 27.81,
-      "shape": "circular",
-      "depth": 113.85,
-      "x": 106.1,
-      "y": 62.2,
-      "z": 5.95,
-      "geometryDefinitionId": "50mlconicalWell"
-    },
-    "B4": {
-      "totalLiquidVolume": 50000,
-      "diameter": 27.81,
-      "shape": "circular",
-      "depth": 113.85,
-      "x": 106.1,
-      "y": 16.8,
-      "z": 5.95,
-      "geometryDefinitionId": "50mlconicalWell"
-    }
-  },
-  "brand": {
-    "brand": "Opentrons",
-    "brandId": [],
-    "links": []
-  },
-  "metadata": {
-    "displayName": "Opentrons 10 Tube Rack (Acrylic) with Falcon 4x50 mL, 6x15 mL Conical",
-    "displayCategory": "tubeRack",
-    "displayVolumeUnits": "mL",
-    "tags": []
-  },
-  "dimensions": {
-    "xDimension": 127.75,
-    "yDimension": 85.5,
-    "zDimension": 123.76
-  },
-  "parameters": {
-    "format": "irregular",
-    "isTiprack": false,
-    "isMagneticModuleCompatible": false,
-    "loadName": "opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical_acrylic"
-  },
-  "ordering": [
-    ["A1", "B1", "C1"],
-    ["A2", "B2", "C2"],
-    ["A3", "B3"],
-    ["A4", "B4"]
-  ],
-  "groups": [
-    {
-      "wells": ["A3", "B3", "A4", "B4"],
-      "metadata": {
-        "displayName": "Falcon 4x50 mL Conical",
-        "displayCategory": "tubeRack",
-        "wellBottomShape": "v"
-      },
-      "brand": {
-        "brand": "Falcon",
-        "brandId": ["352070", "352098"],
-        "links": [
-          "https://ecatalog.corning.com/life-sciences/b2c/US/en/Liquid-Handling/Tubes,-Liquid-Handling/Centrifuge-Tubes/Falcon%C2%AE-Conical-Centrifuge-Tubes/p/falconConicalTubes"
-        ]
-      }
-    },
-    {
-      "wells": ["A1", "B1", "C1", "A2", "B2", "C2"],
-      "metadata": {
-        "displayName": "Falcon 6x15 mL Conical",
-        "displayCategory": "tubeRack",
-        "wellBottomShape": "v"
-      },
-      "brand": {
-        "brand": "Falcon",
-        "brandId": ["352095", "352096", "352097", "352099", "352196"],
-        "links": [
-          "https://ecatalog.corning.com/life-sciences/b2c/US/en/Liquid-Handling/Tubes,-Liquid-Handling/Centrifuge-Tubes/Falcon%C2%AE-Conical-Centrifuge-Tubes/p/falconConicalTubes"
-        ]
-      }
-    }
-  ],
-  "namespace": "opentrons",
-  "version": 2,
-  "schemaVersion": 3,
-  "cornerOffsetFromSlot": {
-    "x": 0,
-    "y": 0,
-    "z": 0
-  },
-  "innerLabwareGeometry": {
-    "15mlconicalWell": {
-      "sections": [
-        {
-          "shape": "spherical",
-          "radiusOfCurvature": 2.9,
-          "topHeight": 0.8,
-          "bottomHeight": 0.0
-        },
-        {
-          "shape": "conical",
-          "bottomDiameter": 4,
-          "topDiameter": 13.5,
-          "topHeight": 20.7,
-          "bottomHeight": 0.8
-        },
-        {
-          "shape": "conical",
-          "bottomDiameter": 13.5,
-          "topDiameter": 14.5,
-          "topHeight": 108.6,
-          "bottomHeight": 20.7
-        },
-        {
-          "shape": "conical",
-          "bottomDiameter": 14.5,
-          "topDiameter": 14.7,
-          "topHeight": 118.2,
-          "bottomHeight": 108.6
-        }
-      ]
-    },
-    "50mlconicalWell": {
-      "sections": [
-        {
-          "shape": "conical",
-          "bottomDiameter": 6.15,
-          "topDiameter": 26.18,
-          "topHeight": 14.3,
-          "bottomHeight": 0.0
-        },
-        {
-          "shape": "conical",
-          "bottomDiameter": 26.18,
-          "topDiameter": 27.52,
-          "topHeight": 100.65,
-          "bottomHeight": 14.3
-        },
-        {
-          "shape": "conical",
-          "bottomDiameter": 27.52,
-          "topDiameter": 27.81,
-          "topHeight": 112.85,
-          "bottomHeight": 100.65
-        }
-      ]
-    }
-  }
-}