chore(merge): merge internal-release -> edge for 0.3.1

Opentrons · Apr 20, 2023 · 699e9cc · 699e9cc
1 parent 0a63799
commit 699e9cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/shared-data/js/constants.ts b/shared-data/js/constants.ts
@@ -40,6 +40,8 @@ export const HEATERSHAKER_MODULE_V1: 'heaterShakerModuleV1' =
   'heaterShakerModuleV1'
 
 export const GRIPPER_V1: 'gripperV1' = 'gripperV1'
+export const GRIPPER_V1_1: 'gripperV1.1' = 'gripperV1.1'
+export const GRIPPER_MODELS = [GRIPPER_V1, GRIPPER_V1_1]
 
 // pipette display categories
 export const GEN3: 'GEN3' = 'GEN3'

diff --git a/shared-data/js/gripper.ts b/shared-data/js/gripper.ts
@@ -1,6 +1,7 @@
 import gripperV1 from '../gripper/definitions/1/gripperV1.json'
+import gripperV1_1 from '../gripper/definitions/1/gripperV1.1.json'
 
-import { GRIPPER_V1 } from './constants'
+import { GRIPPER_V1, GRIPPER_V1_1 } from './constants'
 
 import type { GripperModel, GripperDefinition } from './types'
 
@@ -10,8 +11,13 @@ export const getGripperDef = (
   switch (gripperModel) {
     case GRIPPER_V1:
       return gripperV1 as GripperDefinition
+    case GRIPPER_V1_1:
+      return gripperV1_1 as GripperDefinition
     default:
-      throw new Error(`Invalid gripper model ${gripperModel as string}`)
+      console.warn(
+        `Could not find a gripper with model ${gripperModel}, falling back to most recent definition: ${GRIPPER_V1_1}`
+      )
+      return gripperV1_1 as GripperDefinition
   }
 }
 

diff --git a/shared-data/js/types.ts b/shared-data/js/types.ts
@@ -19,6 +19,7 @@ import {
   LEFT,
   RIGHT,
   GRIPPER_V1,
+  GRIPPER_V1_1,
 } from './constants'
 import type { INode } from 'svgson'
 import type { RunTimeCommand } from '../protocol'
@@ -204,7 +205,7 @@ export type ModuleModel =
   | ThermocyclerModuleModel
   | HeaterShakerModuleModel
 
-export type GripperModel = typeof GRIPPER_V1
+export type GripperModel = typeof GRIPPER_V1 | typeof GRIPPER_V1_1
 
 export type ModuleModelWithLegacy =
   | ModuleModel