Skip to content

Commit

Permalink
rename peek to emulsify
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthecoder committed Nov 19, 2024
1 parent 9d99d54 commit dd74001
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
"displayName": "FLEX 8-Channel PEEK 1000 μL",
"displayName": "FLEX 8-Channel Emulsifying 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_peek/p1000/placeholder.gltf",
"pathTo3D": "pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf",
"nozzleOffset": [-8.0, -16.0, -259.15],
"pipetteBoundingBoxOffsets": {
"backLeftCorner": [-38.5, 0.0, -259.15],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def load_serial_lookup_table() -> Dict[str, str]:
"single_channel": "single",
"ninety_six_channel": "96",
"eight_channel": "multi",
"eight_channel_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}
_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 @@ -126,7 +126,6 @@ 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 "peek" in pipette_name_tuple
):
return 3
elif "gen2" in pipette_name_tuple:
Expand Down Expand Up @@ -200,7 +199,6 @@ 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 "peek" in pipette_name_list
):
return PipetteGenerationType.FLEX
elif "gen2" in pipette_name_list or "2." in pipette_name_list[-1]:
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_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}

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_multipeek",
"p1000_multiemulsify",
"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_PEEK = "p1000_multipeek"
P1000_MULTI_EMULSIFY = "p1000_multiemulsify"
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_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}
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_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}
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_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}
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_peek": "multipeek",
"eight_channel_peek": "multiemulsify",
}
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 dd74001

Please sign in to comment.