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

fix(hardware): Revert "feat(can): add getMoveStatus request & response" #8710

Merged
merged 1 commit into from
Nov 11, 2021
Merged

fix(hardware): Revert "feat(can): add getMoveStatus request & response" #8710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions hardware/opentrons_hardware/drivers/can_bus/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,3 @@ class MessageId(int, Enum):
clear_move_group_request = 0x19
move_group_completed = 0x1A
move_completed = 0x13
get_move_status_request = 0x30
get_move_status_response = 0x31
18 changes: 0 additions & 18 deletions hardware/opentrons_hardware/drivers/can_bus/messages/message_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,21 +178,3 @@ class MoveCompleted: # noqa: D101
payload: payloads.MoveCompletedPayload
payload_type: Type[BinarySerializable] = payloads.MoveCompletedPayload
message_id: Literal[MessageId.move_completed] = MessageId.move_completed


@dataclass
class GetMoveStatusRequest: # noqa: D101
payload: payloads.EmptyPayload
payload_type: Type[BinarySerializable] = payloads.EmptyPayload
message_id: Literal[
MessageId.get_move_status_request
] = MessageId.get_move_status_request


@dataclass
class GetMoveStatusResponse: # noqa: D101
payload: payloads.GetMoveStatusResponsePayload
payload_type: Type[BinarySerializable] = payloads.GetMoveStatusResponsePayload
message_id: Literal[
MessageId.get_move_status_response
] = MessageId.get_move_status_response
2 changes: 0 additions & 2 deletions hardware/opentrons_hardware/drivers/can_bus/messages/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
defs.ClearMoveGroupRequest,
defs.MoveGroupCompleted,
defs.MoveCompleted,
defs.GetMoveStatusRequest,
defs.GetMoveStatusResponse,
]


Expand Down
11 changes: 0 additions & 11 deletions hardware/opentrons_hardware/drivers/can_bus/messages/payloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,3 @@ class MoveCompletedPayload(MoveGroupRequestPayload):
seq_id: utils.UInt8Field
ack_id: utils.UInt8Field
node_id: utils.UInt8Field


@dataclass
class GetMoveStatusResponsePayload(MoveGroupRequestPayload):
"""Read status of current move being executed."""

seq_id: utils.UInt8Field
remaining_duration: utils.UInt64Field
current_position: utils.UInt64Field
node_id: utils.UInt8Field
padding: utils.UInt8Field