Skip to content

Commit a313e65

Browse files
committed
rename peak -> peek and revert display name catagory
1 parent 66a35c3 commit a313e65

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

shared-data/pipette/definitions/2/general/eight_channel_peak/p1000/3_0.json renamed to shared-data/pipette/definitions/2/general/eight_channel_peek/p1000/3_0.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
3-
"displayName": "Peak 8-Channel 1000 μL",
3+
"displayName": "FLEX 8-Channel PEEK 1000 μL",
44
"model": "p1000",
5-
"displayCategory": "PEAK",
5+
"displayCategory": "FLEX",
66
"validNozzleMaps": {
77
"maps": {
88
"SingleA1": ["A1"],

shared-data/pipette/definitions/2/geometry/eight_channel_peak/p1000/3_0.json renamed to shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/3_0.json

Lines changed: 1 addition & 1 deletion
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/p50/placeholder.gltf",
3+
"pathTo3D": "pipette/definitions/2/geometry/eight_channel_peek/p1000/placeholder.gltf",
44
"nozzleOffset": [-8.0, -16.0, -259.15],
55
"pipetteBoundingBoxOffsets": {
66
"backLeftCorner": [-38.5, 0.0, -259.15],

shared-data/pipette/schemas/2/pipettePropertiesSchema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"displayCategory": {
99
"type": "string",
10-
"enum": ["GEN1", "GEN2", "FLEX", "PEAK"]
10+
"enum": ["GEN1", "GEN2", "FLEX"]
1111
},
1212
"positiveNumber": {
1313
"type": "number",

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

Lines changed: 2 additions & 2 deletions
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_peak": "P",
117+
"eight_channel_peek": "P",
118118
}
119119
_channel_model_str = {
120120
"single_channel": "single",
121121
"ninety_six_channel": "96",
122122
"eight_channel": "multi",
123-
"eight_channel_peak": "multi_peak",
123+
"eight_channel_peek": "multi_peek",
124124
}
125125
_model_shorthand = {"p1000": "p1k", "p300": "p3h"}
126126
for channel_dir in _dirs_in(config_path):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def get_major_version_from_pipette_name(
126126
"flex" in pipette_name_tuple
127127
or "gen3" in pipette_name_tuple
128128
or "96" in pipette_name_tuple
129-
or "peak" in pipette_name_tuple
129+
or "peek" in pipette_name_tuple
130130
):
131131
return 3
132132
elif "gen2" in pipette_name_tuple:
@@ -200,7 +200,7 @@ def generation_from_string(pipette_name_list: List[str]) -> PipetteGenerationTyp
200200
or "3." in pipette_name_list[-1]
201201
or pipette_name_list == ["p1000", "96"]
202202
or pipette_name_list == ["p200", "96"]
203-
or "peak" in pipette_name_list
203+
or "peek" in pipette_name_list
204204
):
205205
return PipetteGenerationType.FLEX
206206
elif "gen2" in pipette_name_list or "2." in pipette_name_list[-1]:

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

Lines changed: 3 additions & 3 deletions
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_peak",
219+
"p1000_multi_peek",
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_PEAK = "p1000_multi_peak"
246+
P1000_MULTI_PEEK = "p1000_multi_peek"
247247
P1000_96 = "p1000_96"
248248
P200_96 = "p200_96"
249249

@@ -252,7 +252,7 @@ class PipetteNameType(str, enum.Enum):
252252
# a huge number of them
253253
PipetteModel = NewType("PipetteModel", str)
254254

255-
DisplayCategory = Literal["GEN1", "GEN2", "FLEX", "PEAK"]
255+
DisplayCategory = Literal["GEN1", "GEN2", "FLEX"]
256256

257257
# todo(mm, 2022-03-18):
258258
# The JSON schema defines this as any string, not as an enum of string literals.

0 commit comments

Comments
 (0)