From 3f85123e6ca4221d3aa746719b7e871830558215 Mon Sep 17 00:00:00 2001 From: GiridharBukka <giridhar6937@gmail.com> Date: Mon, 16 Jan 2023 10:32:00 +0530 Subject: [PATCH 1/4] adding msg file, changes in cmakelists nd package.xml --- control_msgs/CMakeLists.txt | 3 +++ control_msgs/msg/MecanumDriveControllerState.msg | 7 +++++++ control_msgs/package.xml | 1 + 3 files changed, 11 insertions(+) create mode 100644 control_msgs/msg/MecanumDriveControllerState.msg diff --git a/control_msgs/CMakeLists.txt b/control_msgs/CMakeLists.txt index 79dd054..e8b71d9 100644 --- a/control_msgs/CMakeLists.txt +++ b/control_msgs/CMakeLists.txt @@ -14,6 +14,7 @@ find_package(action_msgs REQUIRED) find_package(ament_cmake REQUIRED) find_package(builtin_interfaces REQUIRED) find_package(geometry_msgs REQUIRED) +find_package(nav_msgs REQUIRED) find_package(rosidl_default_generators REQUIRED) find_package(sensor_msgs REQUIRED) find_package(std_msgs REQUIRED) @@ -29,6 +30,7 @@ set(msg_files msg/JointJog.msg msg/JointTolerance.msg msg/JointTrajectoryControllerState.msg + msg/MecanumDriveControllerState.msg msg/PidState.msg ) @@ -58,6 +60,7 @@ rosidl_generate_interfaces(${PROJECT_NAME} action_msgs builtin_interfaces geometry_msgs + nav_msgs sensor_msgs std_msgs trajectory_msgs diff --git a/control_msgs/msg/MecanumDriveControllerState.msg b/control_msgs/msg/MecanumDriveControllerState.msg new file mode 100644 index 0000000..6a34250 --- /dev/null +++ b/control_msgs/msg/MecanumDriveControllerState.msg @@ -0,0 +1,7 @@ +std_msgs/Header header +nav_msgs/Odometry odom +float64 front_left_wheel_velocity +float64 back_left_wheel_velocity +float64 back_right_wheel_velocity +float64 front_right_wheel_velocity +geometry_msgs/Twist reference_vel \ No newline at end of file diff --git a/control_msgs/package.xml b/control_msgs/package.xml index d54fa59..2430500 100644 --- a/control_msgs/package.xml +++ b/control_msgs/package.xml @@ -21,6 +21,7 @@ <depend>geometry_msgs</depend> <depend>sensor_msgs</depend> <depend>std_msgs</depend> + <depend>nav_msgs</depend> <depend>trajectory_msgs</depend> <exec_depend>rosidl_default_runtime</exec_depend> From 690806548b91c113f2bb305e8cb02cba3e533e5e Mon Sep 17 00:00:00 2001 From: Robotgir <47585672+Robotgir@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:45:59 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Dr. Denis <denis@stoglrobotics.de> --- control_msgs/msg/MecanumDriveControllerState.msg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control_msgs/msg/MecanumDriveControllerState.msg b/control_msgs/msg/MecanumDriveControllerState.msg index 6a34250..e7215f3 100644 --- a/control_msgs/msg/MecanumDriveControllerState.msg +++ b/control_msgs/msg/MecanumDriveControllerState.msg @@ -1,7 +1,7 @@ std_msgs/Header header -nav_msgs/Odometry odom +nav_msgs/Odometry odometry float64 front_left_wheel_velocity float64 back_left_wheel_velocity float64 back_right_wheel_velocity float64 front_right_wheel_velocity -geometry_msgs/Twist reference_vel \ No newline at end of file +geometry_msgs/Twist reference_velocity \ No newline at end of file From 6e3b1b5df7993c8d4250dcd8a5d774b14192ae0f Mon Sep 17 00:00:00 2001 From: GiridharBukka <giridhar6937@gmail.com> Date: Mon, 30 Jan 2023 17:08:26 +0100 Subject: [PATCH 3/4] ran pre-commit formatter --- control_msgs/msg/MecanumDriveControllerState.msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control_msgs/msg/MecanumDriveControllerState.msg b/control_msgs/msg/MecanumDriveControllerState.msg index e7215f3..b4d71da 100644 --- a/control_msgs/msg/MecanumDriveControllerState.msg +++ b/control_msgs/msg/MecanumDriveControllerState.msg @@ -4,4 +4,4 @@ float64 front_left_wheel_velocity float64 back_left_wheel_velocity float64 back_right_wheel_velocity float64 front_right_wheel_velocity -geometry_msgs/Twist reference_velocity \ No newline at end of file +geometry_msgs/Twist reference_velocity From dbe6b5026f7265a18bd68b99ddf8a61a09be6b77 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" <denis@stoglrobotics.de> Date: Wed, 22 Mar 2023 20:02:44 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- control_msgs/CMakeLists.txt | 2 -- control_msgs/msg/MecanumDriveControllerState.msg | 1 - control_msgs/package.xml | 1 - 3 files changed, 4 deletions(-) diff --git a/control_msgs/CMakeLists.txt b/control_msgs/CMakeLists.txt index e8b71d9..eedf206 100644 --- a/control_msgs/CMakeLists.txt +++ b/control_msgs/CMakeLists.txt @@ -14,7 +14,6 @@ find_package(action_msgs REQUIRED) find_package(ament_cmake REQUIRED) find_package(builtin_interfaces REQUIRED) find_package(geometry_msgs REQUIRED) -find_package(nav_msgs REQUIRED) find_package(rosidl_default_generators REQUIRED) find_package(sensor_msgs REQUIRED) find_package(std_msgs REQUIRED) @@ -60,7 +59,6 @@ rosidl_generate_interfaces(${PROJECT_NAME} action_msgs builtin_interfaces geometry_msgs - nav_msgs sensor_msgs std_msgs trajectory_msgs diff --git a/control_msgs/msg/MecanumDriveControllerState.msg b/control_msgs/msg/MecanumDriveControllerState.msg index b4d71da..0569663 100644 --- a/control_msgs/msg/MecanumDriveControllerState.msg +++ b/control_msgs/msg/MecanumDriveControllerState.msg @@ -1,5 +1,4 @@ std_msgs/Header header -nav_msgs/Odometry odometry float64 front_left_wheel_velocity float64 back_left_wheel_velocity float64 back_right_wheel_velocity diff --git a/control_msgs/package.xml b/control_msgs/package.xml index 2430500..d54fa59 100644 --- a/control_msgs/package.xml +++ b/control_msgs/package.xml @@ -21,7 +21,6 @@ <depend>geometry_msgs</depend> <depend>sensor_msgs</depend> <depend>std_msgs</depend> - <depend>nav_msgs</depend> <depend>trajectory_msgs</depend> <exec_depend>rosidl_default_runtime</exec_depend>