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

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

@@ -1,7 +1,7 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
-    "t50": {
+    "t20": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {
         "default": 35,
@@ -16,7 +16,7 @@
         "valuesByApiLevel": { "2.14": 57 }
       },
       "defaultFlowAcceleration": 1200.0,
-      "defaultTipLength": 57.9,
+      "defaultTipLength": 52.0,
       "defaultReturnTipHeight": 0.71,
       "aspirate": {
         "default": {
@@ -37,9 +37,7 @@
             [9.128, 0.0049, 0.6705],
             [10.16, 0.0033, 0.6854],
             [13.812, 0.0024, 0.6948],
-            [27.204, 0.0008, 0.7165],
-            [50.614, 0.0002, 0.7328],
-            [53.046, -0.0005, 0.7676]
+            [21, 0.0024, 0.6948]
           ]
         }
       },
@@ -62,9 +60,76 @@
             [9.128, 0.0049, 0.6705],
             [10.16, 0.0033, 0.6854],
             [13.812, 0.0024, 0.6948],
-            [27.204, 0.0008, 0.7165],
-            [50.614, 0.0002, 0.7328],
-            [53.046, -0.0005, 0.7676]
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 2
+    },
+    "t50": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 35,
+        "valuesByApiLevel": { "2.14": 35 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.410909, 0.493556, 0.066133],
+            [0.596364, 0.393336, 0.107314],
+            [0.977273, 0.287768, 0.170271],
+            [1.332727, 0.173299, 0.282139],
+            [1.943636, 0.099498, 0.380495],
+            [2.704545, 0.050285, 0.476146],
+            [3.024545, -0.038371, 0.715922],
+            [3.313636, -0.005484, 0.616454],
+            [3.926364, 0.072085, 0.359418],
+            [4.257273, 0.016758, 0.576653],
+            [4.992727, 0.024144, 0.545207],
+            [5.83, 0.017456, 0.5786],
+            [7.226364, 0.008433, 0.631202],
+            [9.033636, 0.00882, 0.628403],
+            [10.071818, 0.004396, 0.668375],
+            [13.759091, 0.003288, 0.679527],
+            [27.283636, 0.001159, 0.708828],
+            [50.902727, 0.000289, 0.732565],
+            [53.340909, -0.000532, 0.77433]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.410909, 0.493556, 0.066133],
+            [0.596364, 0.393336, 0.107314],
+            [0.977273, 0.287768, 0.170271],
+            [1.332727, 0.173299, 0.282139],
+            [1.943636, 0.099498, 0.380495],
+            [2.704545, 0.050285, 0.476146],
+            [3.024545, -0.038371, 0.715922],
+            [3.313636, -0.005484, 0.616454],
+            [3.926364, 0.072085, 0.359418],
+            [4.257273, 0.016758, 0.576653],
+            [4.992727, 0.024144, 0.545207],
+            [5.83, 0.017456, 0.5786],
+            [7.226364, 0.008433, 0.631202],
+            [9.033636, 0.00882, 0.628403],
+            [10.071818, 0.004396, 0.668375],
+            [13.759091, 0.003288, 0.679527],
+            [27.283636, 0.001159, 0.708828],
+            [50.902727, 0.000289, 0.732565],
+            [53.340909, -0.000532, 0.77433]
           ]
         }
       },

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

@@ -1,6 +1,71 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 57,
+      "defaultAspirateFlowRate": {
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 57,
+        "valuesByApiLevel": { "2.14": 57 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 52.0,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.462, 0.5646, 0.0415],
+            [0.648, 0.3716, 0.1307],
+            [1.032, 0.2742, 0.1938],
+            [1.37, 0.1499, 0.3221],
+            [2.014, 0.1044, 0.3845],
+            [2.772, 0.0432, 0.5076],
+            [3.05, -0.0809, 0.8517],
+            [3.4, 0.0256, 0.5268],
+            [3.962, 0.0612, 0.4057],
+            [4.438, 0.0572, 0.4217],
+            [5.164, 0.018, 0.5955],
+            [5.966, 0.0095, 0.6393],
+            [7.38, 0.0075, 0.6514],
+            [9.128, 0.0049, 0.6705],
+            [10.16, 0.0033, 0.6854],
+            [13.812, 0.0024, 0.6948],
+            [21, 0.0024, 0.6948]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 3.5
+    },
     "t50": {
       "uiMaxFlowRate": 57,
       "defaultAspirateFlowRate": {

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

@@ -1,7 +1,7 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
-    "t50": {
+    "t20": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {
         "default": 26.7,
@@ -16,7 +16,7 @@
         "valuesByApiLevel": { "2.14": 26.7 }
       },
       "defaultFlowAcceleration": 1200.0,
-      "defaultTipLength": 57.9,
+      "defaultTipLength": 52.0,
       "defaultReturnTipHeight": 0.71,
       "aspirate": {
         "default": {
@@ -36,8 +36,7 @@
             [8.93, 0.005456, 0.651235],
             [10.0, 0.007108, 0.636489],
             [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [21.61, 0.002591, 0.681656]
           ]
         }
       },
@@ -59,8 +58,74 @@
             [8.93, 0.005456, 0.651235],
             [10.0, 0.007108, 0.636489],
             [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 7
+    },
+    "t50": {
+      "uiMaxFlowRate": 26.7,
+      "defaultAspirateFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 57.9,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.4, 0.507042, 0.058982],
+            [0.593, 0.404962, 0.099815],
+            [0.966, 0.285078, 0.170906],
+            [1.326, 0.178383, 0.273973],
+            [1.947, 0.103651, 0.373068],
+            [2.72, 0.052739, 0.472193],
+            [3.045, -0.036061, 0.71373],
+            [3.369, 0.013437, 0.563006],
+            [3.972, 0.069054, 0.375634],
+            [4.386, 0.042685, 0.480373],
+            [5.089, 0.015649, 0.598954],
+            [5.944, 0.01764, 0.588822],
+            [7.342, 0.006829, 0.653077],
+            [9.094, 0.005478, 0.663002],
+            [10.145, 0.004767, 0.669464],
+            [13.84, 0.003034, 0.687049],
+            [27.343, 0.000964, 0.715687],
+            [45.875, 0.000236, 0.735607]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.4, 0.507042, 0.058982],
+            [0.593, 0.404962, 0.099815],
+            [0.966, 0.285078, 0.170906],
+            [1.326, 0.178383, 0.273973],
+            [1.947, 0.103651, 0.373068],
+            [2.72, 0.052739, 0.472193],
+            [3.045, -0.036061, 0.71373],
+            [3.369, 0.013437, 0.563006],
+            [3.972, 0.069054, 0.375634],
+            [4.386, 0.042685, 0.480373],
+            [5.089, 0.015649, 0.598954],
+            [5.944, 0.01764, 0.588822],
+            [7.342, 0.006829, 0.653077],
+            [9.094, 0.005478, 0.663002],
+            [10.145, 0.004767, 0.669464],
+            [13.84, 0.003034, 0.687049],
+            [27.343, 0.000964, 0.715687],
+            [45.875, 0.000236, 0.735607]
           ]
         }
       },

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

@@ -1,6 +1,69 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json",
   "supportedTips": {
+    "t20": {
+      "uiMaxFlowRate": 26.7,
+      "defaultAspirateFlowRate": {
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
+      },
+      "defaultDispenseFlowRate": {
+        "default": 22,
+        "valuesByApiLevel": { "2.14": 22 }
+      },
+      "defaultBlowOutFlowRate": {
+        "default": 26.7,
+        "valuesByApiLevel": { "2.14": 26.7 }
+      },
+      "defaultFlowAcceleration": 1200.0,
+      "defaultTipLength": 52.0,
+      "defaultReturnTipHeight": 0.71,
+      "aspirate": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "dispense": {
+        "default": {
+          "1": [
+            [0.11, 0.207815, 0.040201],
+            [0.65, 0.43933, 0.014735],
+            [1.04, 0.256666, 0.133466],
+            [1.67, 0.147126, 0.247388],
+            [2.45, 0.078774, 0.361536],
+            [2.89, 0.042387, 0.450684],
+            [3.2, 0.014781, 0.530464],
+            [3.79, 0.071819, 0.347944],
+            [4.22, 0.051592, 0.424605],
+            [4.93, 0.021219, 0.552775],
+            [5.81, 0.023461, 0.541725],
+            [7.21, 0.008959, 0.625982],
+            [8.93, 0.005456, 0.651235],
+            [10.0, 0.007108, 0.636489],
+            [13.61, 0.002591, 0.681656],
+            [21.61, 0.002591, 0.681656]
+          ]
+        }
+      },
+      "defaultPushOutVolume": 3.5
+    },
     "t50": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {

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/pipette/fixtures/name/pipetteNameSpecFixtures.json

@@ -147,7 +147,7 @@
     "maxVolume": 1000
   },
   "p1000_96": {
-    "displayName": "Flex 96-Channel 1000 μL",
+    "displayName": "Flex 96-Channel 1000 µL",
     "defaultAspirateFlowRate": {
       "value": 7.85,
       "min": 3,

package/pipette/schemas/2/pipetteGeometrySchema.json

@@ -90,6 +90,13 @@
       "description": "Minimum space requirements for Liquid Level Detection to work properly",
       "additionalProperties": false,
       "properties": {
+        "t20": {
+          "type": "object",
+          "properties": {
+            "minHeight": { "type": "number" },
+            "minVolume": { "type": "number" }
+          }
+        },
         "t50": {
           "type": "object",
           "properties": {

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
 }