Skip to content

Commit

Permalink
formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoegenburg committed Jul 22, 2024
1 parent 71758bd commit d81441b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
8 changes: 6 additions & 2 deletions include/pipettes/firmware/interfaces_g4.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,15 @@ namespace linear_motor {
auto get_interrupt(motor_hardware::MotorHardware& hw,
LowThroughputInterruptQueues& queues,
stall_check::StallCheck& stall)
-> MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2130_driver::QueueClient>;
-> MotorInterruptHandlerType<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2130_driver::QueueClient>;
auto get_interrupt(motor_hardware::MotorHardware& hw,
HighThroughputInterruptQueues& queues,
stall_check::StallCheck& stall)
-> MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2160_driver::QueueClient>;
-> MotorInterruptHandlerType<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2160_driver::QueueClient>;
auto get_motor_hardware(motor_hardware::HardwareConfig pins)
-> motor_hardware::MotorHardware;
auto get_motion_control(motor_hardware::MotorHardware& hw,
Expand Down
14 changes: 10 additions & 4 deletions include/pipettes/simulator/interfaces.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,14 @@ auto get_interrupt(sim_motor_hardware_iface::SimMotorHardwareIface& hw,
auto get_interrupt_driver(
sim_motor_hardware_iface::SimMotorHardwareIface& hw,
LowThroughputInterruptQueues& queues,
MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2130_driver::QueueClient>& handler) ->
MotorInterruptHandlerType<linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2130_driver::QueueClient>&
handler) ->
#ifdef USE_SENSOR_MOVE
motor_interrupt_driver::MotorInterruptDriver<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2130_driver::QueueClient, motor_messages::SensorSyncMove,
linear_motor_tasks::tmc2130_driver::QueueClient,
motor_messages::SensorSyncMove,
sim_motor_hardware_iface::SimMotorHardwareIface>;
#else
motor_interrupt_driver::MotorInterruptDriver<
Expand All @@ -101,11 +104,14 @@ auto get_interrupt_driver(
auto get_interrupt_driver(
sim_motor_hardware_iface::SimMotorHardwareIface& hw,
HighThroughputInterruptQueues& queues,
MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2160_driver::QueueClient>& handler) ->
MotorInterruptHandlerType<linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2160_driver::QueueClient>&
handler) ->
#ifdef USE_SENSOR_MOVE
motor_interrupt_driver::MotorInterruptDriver<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2160_driver::QueueClient, motor_messages::SensorSyncMove,
linear_motor_tasks::tmc2160_driver::QueueClient,
motor_messages::SensorSyncMove,
sim_motor_hardware_iface::SimMotorHardwareIface>;
#else
motor_interrupt_driver::MotorInterruptDriver<
Expand Down
8 changes: 6 additions & 2 deletions pipettes/firmware/interfaces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ void linear_motor::encoder_interrupt(motor_hardware::MotorHardware& hw,
auto linear_motor::get_interrupt(motor_hardware::MotorHardware& hw,
LowThroughputInterruptQueues& queues,
stall_check::StallCheck& stall)
-> MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2130_driver::QueueClient> {
-> MotorInterruptHandlerType<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2130_driver::QueueClient> {
return motor_handler::MotorInterruptHandler(
queues.plunger_queue, linear_motor_tasks::get_queues(),
linear_motor_tasks::tmc2130_driver::get_queues(), hw, stall,
Expand All @@ -68,7 +70,9 @@ auto linear_motor::get_interrupt(motor_hardware::MotorHardware& hw,
auto linear_motor::get_interrupt(motor_hardware::MotorHardware& hw,
HighThroughputInterruptQueues& queues,
stall_check::StallCheck& stall)
-> MotorInterruptHandlerType<linear_motor_tasks::QueueClient, linear_motor_tasks::tmc2160_driver::QueueClient> {
-> MotorInterruptHandlerType<
linear_motor_tasks::QueueClient,
linear_motor_tasks::tmc2160_driver::QueueClient> {
return motor_handler::MotorInterruptHandler(
queues.plunger_queue, linear_motor_tasks::get_queues(),
linear_motor_tasks::tmc2160_driver::get_queues(), hw, stall,
Expand Down

0 comments on commit d81441b

Please sign in to comment.