Skip to content

Commit

Permalink
formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoegenburg committed Dec 14, 2023
1 parent c6d92c7 commit c7af96e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions gripper/core/tasks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ auto gripper_tasks::start_tasks(
queues.capacitive_sensor_queue_rear =
&capacitive_sensor_task_rear.get_queue();

auto diag0_handler = z_tasks::start_task(z_motor, spi_device, driver_configs, tasks, queues,
tail_accessor);
auto diag0_handler = z_tasks::start_task(
z_motor, spi_device, driver_configs, tasks, queues, tail_accessor);

g_tasks::start_task(grip_motor, tasks, queues, tail_accessor);

Expand Down
14 changes: 8 additions & 6 deletions gripper/firmware/interfaces_z_motor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,12 @@ struct motion_controller::HardwareConfig motor_pins {
.port = ESTOP_IN_PORT,
.pin = ESTOP_IN_PIN,
.active_setting = GPIO_PIN_RESET},
.diag0 = {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
.port = GPIOB,
.pin = GPIO_PIN_2,
.active_setting = GPIO_PIN_RESET},
.diag0 =
{
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
.port = GPIOB,
.pin = GPIO_PIN_2,
.active_setting = GPIO_PIN_RESET},
.ebrake = ebrake
};

Expand Down Expand Up @@ -217,7 +218,8 @@ void z_motor_iface::initialize(diag0_handler* call_diag0_handler) {
Error_Handler();
}
initialize_hardware_z();
set_z_motor_timer_callback(call_motor_handler, call_diag0_handler, call_enc_handler);
set_z_motor_timer_callback(call_motor_handler, call_diag0_handler,
call_enc_handler);
encoder_background_timer.start();
}

Expand Down
2 changes: 1 addition & 1 deletion include/gripper/core/tasks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ auto start_tasks(can::bus::CanBus& can_bus,
eeprom::hardware_iface::EEPromHardwareIface& eeprom_hw_iface,
motor_hardware_task::MotorHardwareTask& zmh_tsk,
motor_hardware_task::MotorHardwareTask& gmh_tsk)
-> z_motor_iface::diag0_handler;
-> z_motor_iface::diag0_handler;

/**
* Access to all the message queues in the system.
Expand Down

0 comments on commit c7af96e

Please sign in to comment.