Skip to content

Commit c001ad5

Browse files
committed
Bug Fixes
Signed-off-by: nitin <[email protected]>
1 parent 42a8ea7 commit c001ad5

File tree

3 files changed

+15
-26
lines changed

3 files changed

+15
-26
lines changed

swerve_drive_controller/include/swerve_drive_controller/swerve_drive_controller.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
#ifndef SWERVE_DRIVE_CONTROLLER__SWERVE_DRIVE_CONTROLLER_HPP_
1515
#define SWERVE_DRIVE_CONTROLLER__SWERVE_DRIVE_CONTROLLER_HPP_
1616

17+
#include "swerve_drive_controller/swerve_drive_kinematics.hpp"
18+
1719
#include <chrono>
1820
#include <cmath>
19-
#include <hardware_interface/loaned_command_interface.hpp>
2021
#include <memory>
2122
#include <queue>
2223
#include <string>
2324
#include <vector>
2425

26+
#include <hardware_interface/loaned_command_interface.hpp>
2527
#include "controller_interface/controller_interface.hpp"
2628
#include "geometry_msgs/msg/twist.hpp"
2729
#include "geometry_msgs/msg/twist_stamped.hpp"
@@ -32,7 +34,6 @@
3234
#include "realtime_tools/realtime_box.hpp"
3335
#include "realtime_tools/realtime_buffer.hpp"
3436
#include "realtime_tools/realtime_publisher.hpp"
35-
#include "swerve_drive_controller/swerve_drive_kinematics.hpp"
3637
#include "tf2_msgs/msg/tf_message.hpp"
3738

3839
namespace swerve_drive_controller

swerve_drive_controller/include/swerve_drive_controller/swerve_drive_kinematics.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717
#include <array>
1818
#include <cmath>
19-
#include <geometry_msgs/msg/twist.hpp>
2019
#include <iostream>
2120
#include <memory>
22-
#include <nav_msgs/msg/odometry.hpp>
23-
#include <tf2_msgs/msg/tf_message.hpp>
2421
#include <utility>
2522
#include <vector>
2623

24+
#include <geometry_msgs/msg/twist.hpp>
25+
#include <nav_msgs/msg/odometry.hpp>
26+
#include <tf2_msgs/msg/tf_message.hpp>
27+
28+
2729
namespace swerve_drive_controller
2830
{
2931

swerve_drive_controller/src/swerve_drive_controller.cpp

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,7 @@ CallbackReturn SwerveController::on_configure(const rclcpp_lifecycle::State & /*
293293
}
294294
received_velocity_msg_ptr_.writeFromNonRT(std::move(msg));
295295
});
296-
}
297-
else
298-
{
296+
}else{
299297
velocity_command_unstamped_subscriber_ = get_node()->create_subscription<Twist>(
300298
DEFAULT_COMMAND_UNSTAMPED_TOPIC, rclcpp::SystemDefaultsQoS(),
301299
[this, logger](const std::shared_ptr<Twist> msg) -> void
@@ -325,9 +323,7 @@ CallbackReturn SwerveController::on_configure(const rclcpp_lifecycle::State & /*
325323
if (tf_prefix == "/")
326324
{
327325
tf_prefix = "";
328-
}
329-
else
330-
{
326+
}else{
331327
tf_prefix = tf_prefix + "/";
332328
}
333329

@@ -536,39 +532,31 @@ controller_interface::return_type SwerveController::update(
536532
{
537533
front_left_axle_handle_->set_position(front_left_angle);
538534
front_left_wheel_handle_->set_velocity(front_left_velocity);
539-
}
540-
else
541-
{
535+
}else{
542536
RCLCPP_ERROR(logger, "Front Left Axle Handle or Wheel Handle is NULLPTR");
543537
}
544538

545539
if (front_right_axle_handle_ != nullptr && front_right_wheel_handle_ != nullptr)
546540
{
547541
front_right_axle_handle_->set_position(front_right_angle);
548542
front_right_wheel_handle_->set_velocity(front_right_velocity);
549-
}
550-
else
551-
{
543+
}else{
552544
RCLCPP_ERROR(logger, "Front Right Axle Handle or Wheel Handle is NULLPTR");
553545
}
554546

555547
if (rear_left_axle_handle_ != nullptr && rear_left_wheel_handle_ != nullptr)
556548
{
557549
rear_left_axle_handle_->set_position(rear_left_angle);
558550
rear_left_wheel_handle_->set_velocity(rear_left_velocity);
559-
}
560-
else
561-
{
551+
}else{
562552
RCLCPP_ERROR(logger, "Rear Left Axle or Wheel Handle is NULLPTR");
563553
}
564554

565555
if (rear_right_axle_handle_ != nullptr && rear_right_wheel_handle_ != nullptr)
566556
{
567557
rear_right_axle_handle_->set_position(rear_right_angle);
568558
rear_right_wheel_handle_->set_velocity(rear_right_velocity);
569-
}
570-
else
571-
{
559+
}else{
572560
RCLCPP_ERROR(logger, "Rear Right Axle or Wheel Handle is NULLPTR");
573561
}
574562
}
@@ -590,9 +578,7 @@ controller_interface::return_type SwerveController::update(
590578
front_left_angle, front_right_angle, rear_left_angle, rear_right_angle};
591579
odometry_ =
592580
swerveDriveKinematics_.update_odometry(velocity_array, steering_angles, update_dt.seconds());
593-
}
594-
else
595-
{
581+
}else{
596582
double front_left_wheel_angle = front_left_axle_handle_->get_feedback();
597583
double front_right_wheel_angle = front_right_axle_handle_->get_feedback();
598584
double rear_left_wheel_angle = rear_left_axle_handle_->get_feedback();

0 commit comments

Comments
 (0)