@opentrons/shared-data 0.1.6-alpha.7 → 0.1.6-alpha.8

package/protocol/types/schemaV3.ts

@@ -1,4 +1,4 @@
-import { PipetteName } from '../../js'
+import type { PipetteName } from '../../js'
 import type {
   DeckSlotId,
   LabwareDefinition2,

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

@@ -6,6 +6,7 @@ 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'
 
 export * from './pipetting'
 export * from './gantry'
@@ -26,7 +27,7 @@ export interface CommonCommandRunTimeInfo {
   createdAt: string
   startedAt: string | null
   completedAt: string | null
-  intent?: 'protocol' | 'setup'
+  intent?: CommandIntent
 }
 export interface CommonCommandCreateInfo {
   key?: string

package/protocol/types/schemaV6/index.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   LoadedPipette,
   LoadedLabware,
   LoadedModule,

package/protocol/types/schemaV7/index.ts

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

package/protocol/types/schemaV8/index.ts

@@ -22,6 +22,11 @@ export interface CommandV8Mixin {
   commands: CreateCommand[]
 }
 
+export interface CommandV9Mixin {
+  commandSchemaId: 'opentronsCommandSchemaV9'
+  commands: CreateCommand[]
+}
+
 export interface CommandAnnotationsStructure {
   commandAnnotationSchemaId: string
   commandAnnotations: any[]
@@ -110,7 +115,7 @@ export type ProtocolFile<
   (OT2RobotMixin | OT3RobotMixin) &
   LabwareV2Mixin &
   LiquidV1Mixin &
-  CommandV8Mixin &
+  (CommandV8Mixin | CommandV9Mixin) &
   CommandAnnotationV1Mixin
 
 export type ProtocolStructure = ProtocolBase<{}> &
@@ -139,6 +144,7 @@ export interface ProtocolAnalysisOutput {
   errors: AnalysisError[]
   runTimeParameters: RunTimeParameter[]
   robotType?: RobotType
+  result: 'ok' | 'not-ok' | 'error' | 'parameter-value-required'
 }
 
 interface AnalysisSourceFile {

package/robot/definitions/1/ot2.json

@@ -1,5 +1,16 @@
 {
   "displayName": "OT-2",
   "robotType": "OT-2 Standard",
-  "models": ["OT-2 Standard", "OT-2 Refresh"]
+  "models": ["OT-2 Standard", "OT-2 Refresh"],
+  "extents": [446.75, 347.5, 0.0],
+  "paddingOffsets": {
+    "rear": -35.91,
+    "front": 31.89,
+    "leftSide": 0,
+    "rightSide": 0
+  },
+  "mountOffsets": {
+    "left": [-34.0, 0.0, 0.0],
+    "right": [0.0, 0.0, 0.0]
+  }
 }

package/robot/definitions/1/ot3.json

@@ -1,5 +1,17 @@
 {
   "displayName": "OT-3",
   "robotType": "OT-3 Standard",
-  "models": ["OT-3 Standard"]
+  "models": ["OT-3 Standard"],
+  "extents": [477.2, 493.8, 0.0],
+  "paddingOffsets": {
+    "rear": -177.42,
+    "front": 51.8,
+    "leftSide": 31.88,
+    "rightSide": -80.32
+  },
+  "mountOffsets": {
+    "left": [-13.5, -60.5, 255.675],
+    "right": [40.5, -60.5, 255.675],
+    "gripper": [84.55, -12.75, 93.85]
+  }
 }

package/robot/schemas/1.json

@@ -5,11 +5,18 @@
     "robotType": {
       "type": "string",
       "enum": ["OT-2 Standard", "OT-3 Standard"]
+    },
+    "xyzArray": {
+      "type": "array",
+      "description": "Array of 3 numbers, [x, y, z]",
+      "items": { "type": "number" },
+      "minItems": 3,
+      "maxItems": 3
     }
   },
   "description": "Describes an Opentrons liquid handling robot.",
   "type": "object",
-  "required": ["displayName", "robotType", "models"],
+  "required": ["displayName", "robotType", "models", "extents", "mountOffsets"],
   "properties": {
     "displayName": {
       "description": "A user-facing friendly name for the machine.",
@@ -25,6 +32,52 @@
       "items": {
         "type": "string"
       }
+    },
+    "extents": {
+      "description": "The maximum addressable coordinates of the deck without instruments.",
+      "$ref": "#/definitions/xyzArray"
+    },
+    "paddingOffsets": {
+      "description": "The distance from a given edge of a deck extent by which the maximum amount of travel is limited.",
+      "type": "object",
+      "required": ["rear", "front", "leftSide", "rightSide"],
+      "properties": {
+        "rear": {
+          "description": "The padding distance from the rear edge of the deck extents which the front nozzles of a pipette must not exceed.",
+          "type": "number"
+        },
+        "front": {
+          "description": "The padding distance from the front edge of the deck extents which the rear nozzles of a pipette must not exceed.",
+          "type": "number"
+        },
+        "leftSide": {
+          "description": "The padding distance from the left edge of the deck extents which the right-most nozzles of a pipette must not exceed.",
+          "type": "number"
+        },
+        "rightSide": {
+          "description": "The padding distance from the right edge of the deck extents which the left-most nozzles of a pipette must not exceed.",
+          "type": "number"
+        }
+      }
+    },
+    "mountOffsets": {
+      "description": "The physical mount offsets from the center of the instrument carriage.",
+      "type": "object",
+      "required": ["left", "right"],
+      "properties": {
+        "left": {
+          "description": "The left mount offset from the center of the carriage to the center of the left mount",
+          "$ref": "#/definitions/xyzArray"
+        },
+        "right": {
+          "description": "The right mount offset from the center of the carriage to the center of the right mount",
+          "$ref": "#/definitions/xyzArray"
+        },
+        "gripper": {
+          "description": "The gripper mount offset from the center of the carriage to the center of the gripper, only on OT-3 Standard definitions",
+          "$ref": "#/definitions/xyzArray"
+        }
+      }
     }
   }
 }

package/tsconfig.json

@@ -5,18 +5,20 @@
     "composite": true,
     "rootDir": ".",
     "outDir": "lib",
-    "moduleResolution": "node",
+    "moduleResolution": "node"
   },
   "module": "ESNext",
   "include": [
     "js",
+    "js/**/*.json",
     "protocol",
     "pipette",
     "labware",
     "deck",
     "command",
+    "errors",
     "liquid/types",
     "commandAnnotation/types",
-    "vite.config.ts",
+    "vite.config.mts"
   ]
 }