rename peak -> peek and revert display name catagory

Opentrons · Nov 19, 2024 · a313e65 · a313e65
1 parent 66a35c3
commit a313e65
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/...general/eight_channel_peak/p1000/3_0.json → ...general/eight_channel_peek/p1000/3_0.json b/...general/eight_channel_peak/p1000/3_0.json → ...general/eight_channel_peek/p1000/3_0.json
@@ -1,8 +1,8 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
-  "displayName": "Peak 8-Channel 1000 μL",
+  "displayName": "FLEX 8-Channel PEEK 1000 μL",
   "model": "p1000",
-  "displayCategory": "PEAK",
+  "displayCategory": "FLEX",
   "validNozzleMaps": {
     "maps": {
       "SingleA1": ["A1"],

diff --git a/...eometry/eight_channel_peak/p1000/3_0.json → ...eometry/eight_channel_peek/p1000/3_0.json b/...eometry/eight_channel_peak/p1000/3_0.json → ...eometry/eight_channel_peek/p1000/3_0.json
@@ -1,6 +1,6 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json",
-  "pathTo3D": "pipette/definitions/2/geometry/eight_channel/p50/placeholder.gltf",
+  "pathTo3D": "pipette/definitions/2/geometry/eight_channel_peek/p1000/placeholder.gltf",
   "nozzleOffset": [-8.0, -16.0, -259.15],
   "pipetteBoundingBoxOffsets": {
     "backLeftCorner": [-38.5, 0.0, -259.15],

diff --git a/...eight_channel_peak/p1000/placeholder.gltf → ...eight_channel_peek/p1000/placeholder.gltf b/...eight_channel_peak/p1000/placeholder.gltf → ...eight_channel_peek/p1000/placeholder.gltf
diff --git a/...eight_channel_peak/p1000/default/3_0.json → ...eight_channel_peek/p1000/default/3_0.json b/...eight_channel_peak/p1000/default/3_0.json → ...eight_channel_peek/p1000/default/3_0.json
diff --git a/shared-data/pipette/schemas/2/pipettePropertiesSchema.json b/shared-data/pipette/schemas/2/pipettePropertiesSchema.json
@@ -7,7 +7,7 @@
     },
     "displayCategory": {
       "type": "string",
-      "enum": ["GEN1", "GEN2", "FLEX", "PEAK"]
+      "enum": ["GEN1", "GEN2", "FLEX"]
     },
     "positiveNumber": {
       "type": "number",

diff --git a/shared-data/python/opentrons_shared_data/pipette/load_data.py b/shared-data/python/opentrons_shared_data/pipette/load_data.py
@@ -114,13 +114,13 @@ def load_serial_lookup_table() -> Dict[str, str]:
         "eight_channel": "M",
         "single_channel": "S",
         "ninety_six_channel": "H",
-        "eight_channel_peak": "P",
+        "eight_channel_peek": "P",
     }
     _channel_model_str = {
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_peak": "multi_peak",
+        "eight_channel_peek": "multi_peek",
     }
     _model_shorthand = {"p1000": "p1k", "p300": "p3h"}
     for channel_dir in _dirs_in(config_path):

diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py b/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py
@@ -126,7 +126,7 @@ def get_major_version_from_pipette_name(
         "flex" in pipette_name_tuple
         or "gen3" in pipette_name_tuple
         or "96" in pipette_name_tuple
-        or "peak" in pipette_name_tuple
+        or "peek" in pipette_name_tuple
     ):
         return 3
     elif "gen2" in pipette_name_tuple:
@@ -200,7 +200,7 @@ def generation_from_string(pipette_name_list: List[str]) -> PipetteGenerationTyp
         or "3." in pipette_name_list[-1]
         or pipette_name_list == ["p1000", "96"]
         or pipette_name_list == ["p200", "96"]
-        or "peak" in pipette_name_list
+        or "peek" in pipette_name_list
     ):
         return PipetteGenerationType.FLEX
     elif "gen2" in pipette_name_list or "2." in pipette_name_list[-1]:

diff --git a/shared-data/python/opentrons_shared_data/pipette/types.py b/shared-data/python/opentrons_shared_data/pipette/types.py
@@ -216,7 +216,7 @@ def dict_for_encode(self) -> bool:
     "p1000_single_gen2",
     "p1000_single_flex",
     "p1000_multi_flex",
-    "p1000_multi_peak",
+    "p1000_multi_peek",
     "p1000_96",
     "p200_96",
 ]
@@ -243,7 +243,7 @@ class PipetteNameType(str, enum.Enum):
     P1000_SINGLE_GEN2 = "p1000_single_gen2"
     P1000_SINGLE_FLEX = "p1000_single_flex"
     P1000_MULTI_FLEX = "p1000_multi_flex"
-    P1000_MULTI_PEAK = "p1000_multi_peak"
+    P1000_MULTI_PEEK = "p1000_multi_peek"
     P1000_96 = "p1000_96"
     P200_96 = "p200_96"
 
@@ -252,7 +252,7 @@ class PipetteNameType(str, enum.Enum):
 # a huge number of them
 PipetteModel = NewType("PipetteModel", str)
 
-DisplayCategory = Literal["GEN1", "GEN2", "FLEX", "PEAK"]
+DisplayCategory = Literal["GEN1", "GEN2", "FLEX"]
 
 # todo(mm, 2022-03-18):
 # The JSON schema defines this as any string, not as an enum of string literals.