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.

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

feat(pipettes): add acceleration to TipActionRequest message #653

Merged
merged 21 commits into from
Jul 27, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
move acceleration to bottom of msg
  • Loading branch information
caila-marashaj committed Jul 18, 2023
commit 1f385bc75d59be2b5c0be71d88fbde3c977b7d3a
10 changes: 5 additions & 5 deletions include/can/core/messages.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1250,39 +1250,39 @@ struct TipActionRequest
uint8_t seq_id;
stepper_timer_ticks duration;
um_per_tick velocity;
um_per_tick_sq acceleration;
can::ids::PipetteTipActionType action;
uint8_t request_stop_condition;
um_per_tick_sq acceleration;

template <bit_utils::ByteIterator Input, typename Limit>
static auto parse(Input body, Limit limit) -> TipActionRequest {
uint8_t group_id = 0;
uint8_t seq_id = 0;
stepper_timer_ticks duration = 0;
um_per_tick velocity = 0;
um_per_tick_sq acceleration = 0;
uint8_t _action = 0;
uint8_t request_stop_condition = 0;
um_per_tick_sq acceleration = 0;
uint32_t msg_ind = 0;

body = bit_utils::bytes_to_int(body, limit, msg_ind);
body = bit_utils::bytes_to_int(body, limit, group_id);
body = bit_utils::bytes_to_int(body, limit, seq_id);
body = bit_utils::bytes_to_int(body, limit, duration);
body = bit_utils::bytes_to_int(body, limit, velocity);
body = bit_utils::bytes_to_int(body, limit, acceleration);
body = bit_utils::bytes_to_int(body, limit, _action);
body = bit_utils::bytes_to_int(body, limit, request_stop_condition);
body = bit_utils::bytes_to_int(body, limit, acceleration);

return TipActionRequest{
.message_index = msg_ind,
.group_id = group_id,
.seq_id = seq_id,
.duration = duration,
.velocity = velocity,
.acceleration = acceleration,
.action = static_cast<can::ids::PipetteTipActionType>(_action),
.request_stop_condition = request_stop_condition};
.request_stop_condition = request_stop_condition,
.acceleration = acceleration};
}

auto operator==(const TipActionRequest& other) const -> bool = default;
Expand Down