Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(hardware): add SN support for the P1KP pipette #16907

Merged
merged 2 commits into from
Nov 20, 2024
Merged

feat(hardware): add SN support for the P1KP pipette #16907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7855b27
feat(hardware): add SN support for the P1KP pipette
ryanthecoder Nov 20, 2024
80c8564
make test serial more clear
ryanthecoder Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/src/opentrons/hardware_control/backends/ot3controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +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.p50_single: "P50S",
FirmwarePipetteName.p50_multi: "P50M",
FirmwarePipetteName.p1000_96: "P1KH",
Expand Down
1 change: 1 addition & 0 deletions hardware/opentrons_hardware/firmware_bindings/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ class PipetteName(int, Enum):
p1000_96 = 0x04
p50_96 = 0x05
p200_96 = 0x06
p1000_multi_emulsify = 0x07
unknown = 0xFFFF


Expand Down
1 change: 1 addition & 0 deletions hardware/opentrons_hardware/instruments/pipettes/serials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
NAME_LOOKUP: Dict[str, PipetteName] = {
"P1KS": PipetteName.p1000_single,
"P1KM": PipetteName.p1000_multi,
"P1KP": PipetteName.p1000_multi_emulsify,
"P50S": PipetteName.p50_single,
"P50M": PipetteName.p50_multi,
"P1KH": PipetteName.p1000_96,
Expand Down
6 changes: 6 additions & 0 deletions hardware/tests/opentrons_hardware/instruments/test_serials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
1,
b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
),
(
"P1KPV30",
PipetteName.p1000_multi_emulsify,
30,
b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if this would be more clear or less clear, but you can do b"\x00"*16 to avoid having to type out 16 null bytes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

neat, I had just copied the other one

),
],
)
def test_scan_valid_pipette_serials(
Expand Down
2 changes: 2 additions & 0 deletions shared-data/python/opentrons_shared_data/pipette/dev_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"p1000_single_gen2",
"p1000_single_flex",
"p1000_multi_flex",
"p1000_multi_emulsify",
"p1000_96",
"p200_96",
]
Expand All @@ -57,6 +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_96 = "p1000_96"
P200_96 = "p200_96"

Expand Down
Loading