chore(shared-data): rename emulsify to em

Opentrons · Nov 20, 2024 · 74aca83 · 74aca83
1 parent 7855b27
commit 74aca83
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 18 deletions.
diff --git a/api/src/opentrons/hardware_control/backends/ot3controller.py b/api/src/opentrons/hardware_control/backends/ot3controller.py
@@ -1008,7 +1008,7 @@ def _lookup_serial_key(pipette_name: FirmwarePipetteName) -> str:
         lookup_name = {
             FirmwarePipetteName.p1000_single: "P1KS",
             FirmwarePipetteName.p1000_multi: "P1KM",
-            FirmwarePipetteName.p1000_multi_emulsify: "P1KP",
+            FirmwarePipetteName.p1000_multi_em: "P1KP",
             FirmwarePipetteName.p50_single: "P50S",
             FirmwarePipetteName.p50_multi: "P50M",
             FirmwarePipetteName.p1000_96: "P1KH",

diff --git a/hardware/opentrons_hardware/firmware_bindings/constants.py b/hardware/opentrons_hardware/firmware_bindings/constants.py
@@ -359,7 +359,7 @@ class PipetteName(int, Enum):
     p1000_96 = 0x04
     p50_96 = 0x05
     p200_96 = 0x06
-    p1000_multi_emulsify = 0x07
+    p1000_multi_em = 0x07
     unknown = 0xFFFF
 
 

diff --git a/hardware/opentrons_hardware/instruments/pipettes/serials.py b/hardware/opentrons_hardware/instruments/pipettes/serials.py
@@ -27,7 +27,7 @@
 NAME_LOOKUP: Dict[str, PipetteName] = {
     "P1KS": PipetteName.p1000_single,
     "P1KM": PipetteName.p1000_multi,
-    "P1KP": PipetteName.p1000_multi_emulsify,
+    "P1KP": PipetteName.p1000_multi_em,
     "P50S": PipetteName.p50_single,
     "P50M": PipetteName.p50_multi,
     "P1KH": PipetteName.p1000_96,

diff --git a/hardware/tests/opentrons_hardware/instruments/test_serials.py b/hardware/tests/opentrons_hardware/instruments/test_serials.py
@@ -42,7 +42,7 @@
         ),
         (
             "P1KPV30",
-            PipetteName.p1000_multi_emulsify,
+            PipetteName.p1000_multi_em,
             30,
             b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
         ),

diff --git a/shared-data/command/schemas/11.json b/shared-data/command/schemas/11.json
@@ -2690,7 +2690,7 @@
         "p1000_single_gen2",
         "p1000_single_flex",
         "p1000_multi_flex",
-        "p1000_multi_emulsify",
+        "p1000_multi_em",
         "p1000_96",
         "p200_96"
       ],

diff --git a/shared-data/js/constants.ts b/shared-data/js/constants.ts
@@ -145,6 +145,7 @@ export const OT3_PIPETTES = [
   'p50_single_flex',
   'p50_multi_flex',
   'p1000_multi_flex',
+  'p1000_multi_em_flex',
   'p1000_96',
   'p200_96',
 ]

diff --git a/...ral/eight_channel_emulsify/p1000/3_0.json → ...2/general/eight_channel_em/p1000/3_0.json b/...ral/eight_channel_emulsify/p1000/3_0.json → ...2/general/eight_channel_em/p1000/3_0.json
@@ -1,6 +1,6 @@
 {
   "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
-  "displayName": "FLEX 8-Channel Emulsifying 1000 μL",
+  "displayName": "FLEX 8-Channel EM 1000 μL",
   "model": "p1000",
   "displayCategory": "FLEX",
   "validNozzleMaps": {

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

diff --git a/...t_channel_emulsify/p1000/placeholder.gltf → ...y/eight_channel_em/p1000/placeholder.gltf b/...t_channel_emulsify/p1000/placeholder.gltf → ...y/eight_channel_em/p1000/placeholder.gltf
diff --git a/...t_channel_emulsify/p1000/default/3_0.json → ...d/eight_channel_em/p1000/default/3_0.json b/...t_channel_emulsify/p1000/default/3_0.json → ...d/eight_channel_em/p1000/default/3_0.json
diff --git a/shared-data/python/opentrons_shared_data/pipette/dev_types.py b/shared-data/python/opentrons_shared_data/pipette/dev_types.py
@@ -31,7 +31,7 @@
     "p1000_single_gen2",
     "p1000_single_flex",
     "p1000_multi_flex",
-    "p1000_multi_emulsify",
+    "p1000_multi_em",
     "p1000_96",
     "p200_96",
 ]
@@ -58,7 +58,7 @@ class PipetteNameType(str, Enum):
     P1000_SINGLE_GEN2 = "p1000_single_gen2"
     P1000_SINGLE_FLEX = "p1000_single_flex"
     P1000_MULTI_FLEX = "p1000_multi_flex"
-    P1000_MULTI_EMULSIFY = "p1000_multi_emulsify"
+    P1000_MULTI_EM = "p1000_multi_em"
     P1000_96 = "p1000_96"
     P200_96 = "p200_96"
 

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_emulsify": "P",
+        "eight_channel_em": "P",
     }
     _channel_model_str = {
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
     _model_shorthand = {"p1000": "p1k", "p300": "p3h"}
     for channel_dir in _dirs_in(config_path):

diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py b/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py
@@ -355,7 +355,7 @@ def _update_all_models(configuration_to_update: List[str]) -> None:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
 
     for channel_dir in os.listdir(paths_to_validate):

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_emulsify",
+    "p1000_multi_em",
     "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_EMULSIFY = "p1000_multi_emulsify"
+    P1000_MULTI_EM = "p1000_multi_em"
     P1000_96 = "p1000_96"
     P200_96 = "p200_96"
 

diff --git a/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py b/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py
@@ -49,7 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):

diff --git a/shared-data/python/tests/pipette/test_validate_schema.py b/shared-data/python/tests/pipette/test_validate_schema.py
@@ -22,7 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
     defn_root = get_shared_data_root() / "pipette" / "definitions" / "2" / "liquid"
     assert os.listdir(defn_root), "A path is wrong"
@@ -64,7 +64,7 @@ def test_pick_up_configs_configuration_by_nozzle_map_keys() -> None:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):
@@ -107,7 +107,7 @@ def test_pick_up_configs_configuration_ordered_from_smallest_to_largest() -> Non
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multi_emulsify",
+        "eight_channel_em": "multi_em",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):