Skip to content

Commit 3839366

Browse files
authored
chore(shared-data): rename emulsify to em (#16911)
<!-- Thanks for taking the time to open a Pull Request (PR)! Please make sure you've read the "Opening Pull Requests" section of our Contributing Guide: https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests GitHub provides robust markdown to format your PR. Links, diagrams, pictures, and videos along with text formatting make it possible to create a rich and informative PR. For more information on GitHub markdown, see: https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax To ensure your code is reviewed quickly and thoroughly, please fill out the sections below to the best of your ability! --> # Overview In order to simplify and make future planning for how to display this OEM rename emulsify to EM everywhere for the new 8 channel <!-- Describe your PR at a high level. State acceptance criteria and how this PR fits into other work. Link issues, PRs, and other relevant resources. --> ## Test Plan and Hands on Testing <!-- Describe your testing of the PR. Emphasize testing not reflected in the code. Attach protocols, logs, screenshots and any other assets that support your testing. --> ## Changelog <!-- List changes introduced by this PR considering future developers and the end user. Give careful thought and clear documentation to breaking changes. --> ## Review requests <!-- - What do you need from reviewers to feel confident this PR is ready to merge? - Ask questions. --> ## Risk assessment <!-- - Indicate the level of attention this PR needs. - Provide context to guide reviewers. - Discuss trade-offs, coupling, and side effects. - Look for the possibility, even if you think it's small, that your change may affect some other part of the system. - For instance, changing return tip behavior may also change the behavior of labware calibration. - How do your unit tests and on hands on testing mitigate this PR's risks and the risk of future regressions? - Especially in high risk PRs, explain how you know your testing is enough. -->
1 parent df0f18c commit 3839366

File tree

16 files changed

+20
-19
lines changed

16 files changed

+20
-19
lines changed

api/src/opentrons/hardware_control/backends/ot3controller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ def _lookup_serial_key(pipette_name: FirmwarePipetteName) -> str:
10081008
lookup_name = {
10091009
FirmwarePipetteName.p1000_single: "P1KS",
10101010
FirmwarePipetteName.p1000_multi: "P1KM",
1011-
FirmwarePipetteName.p1000_multi_emulsify: "P1KP",
1011+
FirmwarePipetteName.p1000_multi_em: "P1KP",
10121012
FirmwarePipetteName.p50_single: "P50S",
10131013
FirmwarePipetteName.p50_multi: "P50M",
10141014
FirmwarePipetteName.p1000_96: "P1KH",

hardware/opentrons_hardware/firmware_bindings/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class PipetteName(int, Enum):
359359
p1000_96 = 0x04
360360
p50_96 = 0x05
361361
p200_96 = 0x06
362-
p1000_multi_emulsify = 0x07
362+
p1000_multi_em = 0x07
363363
unknown = 0xFFFF
364364

365365

hardware/opentrons_hardware/instruments/pipettes/serials.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
NAME_LOOKUP: Dict[str, PipetteName] = {
2828
"P1KS": PipetteName.p1000_single,
2929
"P1KM": PipetteName.p1000_multi,
30-
"P1KP": PipetteName.p1000_multi_emulsify,
30+
"P1KP": PipetteName.p1000_multi_em,
3131
"P50S": PipetteName.p50_single,
3232
"P50M": PipetteName.p50_multi,
3333
"P1KH": PipetteName.p1000_96,

hardware/tests/opentrons_hardware/instruments/test_serials.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
),
4343
(
4444
"P1KPV30",
45-
PipetteName.p1000_multi_emulsify,
45+
PipetteName.p1000_multi_em,
4646
30,
47-
b"\x00"*16,
47+
b"\x00" * 16,
4848
),
4949
],
5050
)

shared-data/command/schemas/11.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2690,7 +2690,7 @@
26902690
"p1000_single_gen2",
26912691
"p1000_single_flex",
26922692
"p1000_multi_flex",
2693-
"p1000_multi_emulsify",
2693+
"p1000_multi_em",
26942694
"p1000_96",
26952695
"p200_96"
26962696
],

shared-data/js/constants.ts

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ export const OT3_PIPETTES = [
145145
'p50_single_flex',
146146
'p50_multi_flex',
147147
'p1000_multi_flex',
148+
'p1000_multi_em_flex',
148149
'p1000_96',
149150
'p200_96',
150151
]

shared-data/pipette/definitions/2/general/eight_channel_emulsify/p1000/3_0.json renamed to shared-data/pipette/definitions/2/general/eight_channel_em/p1000/3_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
3-
"displayName": "FLEX 8-Channel Emulsifying 1000 μL",
3+
"displayName": "FLEX 8-Channel EM 1000 μL",
44
"model": "p1000",
55
"displayCategory": "FLEX",
66
"validNozzleMaps": {

shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/3_0.json renamed to shared-data/pipette/definitions/2/geometry/eight_channel_em/p1000/3_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json",
3-
"pathTo3D": "pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf",
3+
"pathTo3D": "pipette/definitions/2/geometry/eight_channel_em/p1000/placeholder.gltf",
44
"nozzleOffset": [-8.0, -16.0, -259.15],
55
"pipetteBoundingBoxOffsets": {
66
"backLeftCorner": [-38.5, 0.0, -259.15],

shared-data/python/opentrons_shared_data/pipette/dev_types.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"p1000_single_gen2",
3232
"p1000_single_flex",
3333
"p1000_multi_flex",
34-
"p1000_multi_emulsify",
34+
"p1000_multi_em",
3535
"p1000_96",
3636
"p200_96",
3737
]
@@ -58,7 +58,7 @@ class PipetteNameType(str, Enum):
5858
P1000_SINGLE_GEN2 = "p1000_single_gen2"
5959
P1000_SINGLE_FLEX = "p1000_single_flex"
6060
P1000_MULTI_FLEX = "p1000_multi_flex"
61-
P1000_MULTI_EMULSIFY = "p1000_multi_emulsify"
61+
P1000_MULTI_EM = "p1000_multi_em"
6262
P1000_96 = "p1000_96"
6363
P200_96 = "p200_96"
6464

shared-data/python/opentrons_shared_data/pipette/load_data.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ def load_serial_lookup_table() -> Dict[str, str]:
114114
"eight_channel": "M",
115115
"single_channel": "S",
116116
"ninety_six_channel": "H",
117-
"eight_channel_emulsify": "P",
117+
"eight_channel_em": "P",
118118
}
119119
_channel_model_str = {
120120
"single_channel": "single",
121121
"ninety_six_channel": "96",
122122
"eight_channel": "multi",
123-
"eight_channel_emulsify": "multi_emulsify",
123+
"eight_channel_em": "multi_em",
124124
}
125125
_model_shorthand = {"p1000": "p1k", "p300": "p3h"}
126126
for channel_dir in _dirs_in(config_path):

shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def _update_all_models(configuration_to_update: List[str]) -> None:
355355
"single_channel": "single",
356356
"ninety_six_channel": "96",
357357
"eight_channel": "multi",
358-
"eight_channel_emulsify": "multi_emulsify",
358+
"eight_channel_em": "multi_em",
359359
}
360360

361361
for channel_dir in os.listdir(paths_to_validate):

shared-data/python/opentrons_shared_data/pipette/types.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def dict_for_encode(self) -> bool:
216216
"p1000_single_gen2",
217217
"p1000_single_flex",
218218
"p1000_multi_flex",
219-
"p1000_multi_emulsify",
219+
"p1000_multi_em",
220220
"p1000_96",
221221
"p200_96",
222222
]
@@ -243,7 +243,7 @@ class PipetteNameType(str, enum.Enum):
243243
P1000_SINGLE_GEN2 = "p1000_single_gen2"
244244
P1000_SINGLE_FLEX = "p1000_single_flex"
245245
P1000_MULTI_FLEX = "p1000_multi_flex"
246-
P1000_MULTI_EMULSIFY = "p1000_multi_emulsify"
246+
P1000_MULTI_EM = "p1000_multi_em"
247247
P1000_96 = "p1000_96"
248248
P200_96 = "p200_96"
249249

shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]:
4949
"single_channel": "single",
5050
"ninety_six_channel": "96",
5151
"eight_channel": "multi",
52-
"eight_channel_emulsify": "multi_emulsify",
52+
"eight_channel_em": "multi_em",
5353
}
5454
assert os.listdir(paths_to_validate), "You have a path wrong"
5555
for channel_dir in os.listdir(paths_to_validate):

shared-data/python/tests/pipette/test_validate_schema.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]:
2222
"single_channel": "single",
2323
"ninety_six_channel": "96",
2424
"eight_channel": "multi",
25-
"eight_channel_emulsify": "multi_emulsify",
25+
"eight_channel_em": "multi_em",
2626
}
2727
defn_root = get_shared_data_root() / "pipette" / "definitions" / "2" / "liquid"
2828
assert os.listdir(defn_root), "A path is wrong"
@@ -64,7 +64,7 @@ def test_pick_up_configs_configuration_by_nozzle_map_keys() -> None:
6464
"single_channel": "single",
6565
"ninety_six_channel": "96",
6666
"eight_channel": "multi",
67-
"eight_channel_emulsify": "multi_emulsify",
67+
"eight_channel_em": "multi_em",
6868
}
6969
assert os.listdir(paths_to_validate), "You have a path wrong"
7070
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
107107
"single_channel": "single",
108108
"ninety_six_channel": "96",
109109
"eight_channel": "multi",
110-
"eight_channel_emulsify": "multi_emulsify",
110+
"eight_channel_em": "multi_em",
111111
}
112112
assert os.listdir(paths_to_validate), "You have a path wrong"
113113
for channel_dir in os.listdir(paths_to_validate):

0 commit comments

Comments
 (0)