Skip to content

Commit

Permalink
chore(shared-data): rename emulsify to em (#16911)
Browse files Browse the repository at this point in the history
<!--
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.
-->
  • Loading branch information
ryanthecoder authored Nov 20, 2024
1 parent df0f18c commit 3839366
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion hardware/opentrons_hardware/firmware_bindings/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions hardware/tests/opentrons_hardware/instruments/test_serials.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
),
(
"P1KPV30",
PipetteName.p1000_multi_emulsify,
PipetteName.p1000_multi_em,
30,
b"\x00"*16,
b"\x00" * 16,
),
],
)
Expand Down
2 changes: 1 addition & 1 deletion shared-data/command/schemas/11.json
Original file line number Diff line number Diff line change
Expand Up @@ -2690,7 +2690,7 @@
"p1000_single_gen2",
"p1000_single_flex",
"p1000_multi_flex",
"p1000_multi_emulsify",
"p1000_multi_em",
"p1000_96",
"p200_96"
],
Expand Down
1 change: 1 addition & 0 deletions shared-data/js/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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],
Expand Down
4 changes: 2 additions & 2 deletions shared-data/python/opentrons_shared_data/pipette/dev_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"p1000_single_gen2",
"p1000_single_flex",
"p1000_multi_flex",
"p1000_multi_emulsify",
"p1000_multi_em",
"p1000_96",
"p200_96",
]
Expand All @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions shared-data/python/opentrons_shared_data/pipette/load_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions shared-data/python/opentrons_shared_data/pipette/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand All @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions shared-data/python/tests/pipette/test_validate_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 3839366

Please sign in to comment.