Compare commits

..

2 Commits

Author SHA1 Message Date
chyoo e2315358bf feat(nav2): publish mkmini steering feedback 2026-08-10 09:10:57 +09:00
chyoo 7b873ef97c Sync module source with week 5 baseline 2026-08-06 18:04:47 +09:00
3 changed files with 7 additions and 3 deletions
@@ -20,8 +20,8 @@ if(${ENABLE_TRANSFORM})
add_definitions("-DENABLE_TRANSFORM") add_definitions("-DENABLE_TRANSFORM")
endif(${ENABLE_TRANSFORM}) endif(${ENABLE_TRANSFORM})
set(vanjee_driver_INCLUDE_DIRS "/home/dgist/Desktop/module/nav2_MKminivehicle_ws/src/vanjee/vanjee_lidar_sdk/src/vanjee_driver/src;/usr/local/vanjee_lidar_sdk/include") set(vanjee_driver_INCLUDE_DIRS "/modules/[lms-nav2-mkmini]nav2-mkmini_v1.0.0_ws/src/vanjee/vanjee_lidar_sdk/src/vanjee_driver/src;/usr/local/vanjee_lidar_sdk/include")
set(VANJEE_DRIVER_INCLUDE_DIRS "/home/dgist/Desktop/module/nav2_MKminivehicle_ws/src/vanjee/vanjee_lidar_sdk/src/vanjee_driver/src;/usr/local/vanjee_lidar_sdk/include") set(VANJEE_DRIVER_INCLUDE_DIRS "/modules/[lms-nav2-mkmini]nav2-mkmini_v1.0.0_ws/src/vanjee/vanjee_lidar_sdk/src/vanjee_driver/src;/usr/local/vanjee_lidar_sdk/include")
set(vanjee_driver_LIBRARIES "pthread") set(vanjee_driver_LIBRARIES "pthread")
set(VANJEE_DRIVER_LIBRARIES "pthread") set(VANJEE_DRIVER_LIBRARIES "pthread")
@@ -58,6 +58,7 @@ private:
rclcpp::Publisher<yhs_can_interfaces::msg::ChassisInfoFb>::SharedPtr chassis_info_fb_publisher_; rclcpp::Publisher<yhs_can_interfaces::msg::ChassisInfoFb>::SharedPtr chassis_info_fb_publisher_;
rclcpp::Publisher<nav_msgs::msg::Odometry>::SharedPtr odom_pub_; rclcpp::Publisher<nav_msgs::msg::Odometry>::SharedPtr odom_pub_;
rclcpp::Publisher<std_msgs::msg::Float64>::SharedPtr steering_angle_pub_;
void io_cmd_callback(const yhs_can_interfaces::msg::IoCmd::SharedPtr io_cmd_msg); void io_cmd_callback(const yhs_can_interfaces::msg::IoCmd::SharedPtr io_cmd_msg);
@@ -75,4 +76,3 @@ private:
#endif #endif
@@ -19,6 +19,7 @@
chassis_info_fb_publisher_ = node_->create_publisher<yhs_can_interfaces::msg::ChassisInfoFb>("chassis_info_fb", 1); chassis_info_fb_publisher_ = node_->create_publisher<yhs_can_interfaces::msg::ChassisInfoFb>("chassis_info_fb", 1);
odom_pub_ = node_->create_publisher<nav_msgs::msg::Odometry>("odom", 1); odom_pub_ = node_->create_publisher<nav_msgs::msg::Odometry>("odom", 1);
steering_angle_pub_ = node_->create_publisher<std_msgs::msg::Float64>("/mkmini/steering_angle", 1);
} }
void CanControl::io_cmd_callback(const yhs_can_interfaces::msg::IoCmd::SharedPtr io_cmd_msg) void CanControl::io_cmd_callback(const yhs_can_interfaces::msg::IoCmd::SharedPtr io_cmd_msg)
@@ -172,6 +173,9 @@ whether the can line is connected correctly, and whether the chassis is powered
chassis_info_msg.header.stamp = node_->get_clock()->now(); chassis_info_msg.header.stamp = node_->get_clock()->now();
chassis_info_msg.ctrl_fb = msg; chassis_info_msg.ctrl_fb = msg;
chassis_info_fb_publisher_->publish(chassis_info_msg); chassis_info_fb_publisher_->publish(chassis_info_msg);
std_msgs::msg::Float64 steering_angle;
steering_angle.data = msg.ctrl_fb_steering / 180.0 * M_PI;
steering_angle_pub_->publish(steering_angle);
if(msg.ctrl_fb_gear == 2) msg.ctrl_fb_velocity = -msg.ctrl_fb_velocity; if(msg.ctrl_fb_gear == 2) msg.ctrl_fb_velocity = -msg.ctrl_fb_velocity;
publish_odom(msg.ctrl_fb_velocity, msg.ctrl_fb_steering/180*3.1415); publish_odom(msg.ctrl_fb_velocity, msg.ctrl_fb_steering/180*3.1415);
} }