From 03a0dfd40ead08103f482c530fc6f3b46ffd1ffa Mon Sep 17 00:00:00 2001 From: RonaldsonBellande Date: Wed, 4 Oct 2023 21:01:09 -0400 Subject: [PATCH 1/2] latest pushes --- humanoid_robot_read_write_demo/CMakeLists.txt | 2 - humanoid_robot_read_write_demo/package.xml | 76 +++++++++---------- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/humanoid_robot_read_write_demo/CMakeLists.txt b/humanoid_robot_read_write_demo/CMakeLists.txt index 675b63e..40ef26a 100644 --- a/humanoid_robot_read_write_demo/CMakeLists.txt +++ b/humanoid_robot_read_write_demo/CMakeLists.txt @@ -25,8 +25,6 @@ if($ENV{ROS_VERSION} EQUAL 1) sensor_msgs std_msgs ) -else() - ament_package() endif() diff --git a/humanoid_robot_read_write_demo/package.xml b/humanoid_robot_read_write_demo/package.xml index 41fd836..5c8ed9e 100644 --- a/humanoid_robot_read_write_demo/package.xml +++ b/humanoid_robot_read_write_demo/package.xml @@ -8,50 +8,46 @@ Apache 2.0 Ronaldson Bellande + catkin + + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager + + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager + + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager + + ament_cmake + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - - - - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - - roscpp - std_msgs - sensor_msgs - humanoid_robot_controller_msgs - humanoid_robot_manager - + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager + roscpp + std_msgs + sensor_msgs + humanoid_robot_controller_msgs + humanoid_robot_manager From deb0fbcc5b1d83a036cbddfc9d5cccb446489096 Mon Sep 17 00:00:00 2001 From: RonaldsonBellande Date: Wed, 4 Oct 2023 23:32:29 -0400 Subject: [PATCH 2/2] latest pushes --- humanoid_robot_ball_detector/CMakeLists.txt | 2 - humanoid_robot_ball_detector/package.xml | 209 ++++++++--------- humanoid_robot_bringup/CMakeLists.txt | 2 - humanoid_robot_bringup/package.xml | 90 ++++--- humanoid_robot_demo/CMakeLists.txt | 3 - humanoid_robot_demo/package.xml | 245 ++++++++++---------- humanoid_robot_read_write_demo/package.xml | 2 +- 7 files changed, 268 insertions(+), 285 deletions(-) diff --git a/humanoid_robot_ball_detector/CMakeLists.txt b/humanoid_robot_ball_detector/CMakeLists.txt index c4eb1c1..0a54aa1 100644 --- a/humanoid_robot_ball_detector/CMakeLists.txt +++ b/humanoid_robot_ball_detector/CMakeLists.txt @@ -76,8 +76,6 @@ if($ENV{ROS_VERSION} EQUAL 1) message_runtime DEPENDS Boost OpenCV ) -else() - ament_package() endif() diff --git a/humanoid_robot_ball_detector/package.xml b/humanoid_robot_ball_detector/package.xml index 8f62b4f..19f9714 100644 --- a/humanoid_robot_ball_detector/package.xml +++ b/humanoid_robot_ball_detector/package.xml @@ -1,7 +1,7 @@ humanoid_robot_ball_detector - 0.1.0 + 0.3.2 This package implements a circle-like shape detector of the input image It requires and input image and publish, at frame rate, a marked image @@ -10,116 +10,113 @@ Apache 2.0 Ronaldson Bellande + catkin + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera + + ament_cmake + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera - - - - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - dynamic_reconfigure - cv_bridge - image_transport - boost - opencv3 - yaml-cpp - message_generation - message_runtime - message_runtime - usb_cam - uvc_camera - + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + dynamic_reconfigure + cv_bridge + image_transport + boost + opencv3 + yaml-cpp + message_generation + message_runtime + message_runtime + usb_cam + uvc_camera diff --git a/humanoid_robot_bringup/CMakeLists.txt b/humanoid_robot_bringup/CMakeLists.txt index b54a85b..da5f24e 100644 --- a/humanoid_robot_bringup/CMakeLists.txt +++ b/humanoid_robot_bringup/CMakeLists.txt @@ -11,8 +11,6 @@ endif() if($ENV{ROS_VERSION} EQUAL 1) catkin_package() -else() - ament_package() endif() install( diff --git a/humanoid_robot_bringup/package.xml b/humanoid_robot_bringup/package.xml index b11f545..20d2b13 100644 --- a/humanoid_robot_bringup/package.xml +++ b/humanoid_robot_bringup/package.xml @@ -1,7 +1,7 @@ humanoid_robot_bringup - 0.3.0 + 0.3.2 This package is a demo for first time users. There is an example in the demo where you can run and visualize the robot. @@ -9,56 +9,52 @@ Apache 2.0 Ronaldson Bellande + catkin + + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz + + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz + + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz + + ament_cmake + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - - - - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - - humanoid_robot_manager - humanoid_robot_description - usb_cam - joint_state_publisher - robot_state_publisher - rviz - + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz + humanoid_robot_manager + humanoid_robot_description + usb_cam + joint_state_publisher + robot_state_publisher + rviz diff --git a/humanoid_robot_demo/CMakeLists.txt b/humanoid_robot_demo/CMakeLists.txt index abdb213..049d16a 100644 --- a/humanoid_robot_demo/CMakeLists.txt +++ b/humanoid_robot_demo/CMakeLists.txt @@ -17,7 +17,6 @@ if($ENV{ROS_VERSION} EQUAL 1) humanoid_robot_math humanoid_robot_ball_detector ) - find_package(Boost REQUIRED COMPONENTS thread) find_package(Eigen3 REQUIRED) else() @@ -61,8 +60,6 @@ if($ENV{ROS_VERSION} EQUAL 1) humanoid_robot_ball_detector DEPENDS Boost EIGEN3 ) -else() - ament_package() endif() diff --git a/humanoid_robot_demo/package.xml b/humanoid_robot_demo/package.xml index 24efcd0..1accda9 100644 --- a/humanoid_robot_demo/package.xml +++ b/humanoid_robot_demo/package.xml @@ -1,7 +1,7 @@ humanoid_robot_demo - 0.3.0 + 0.3.2 HUMANOID_ROBOT default demo It includes three demontrations(soccer demo, vision demo, action script demo) @@ -9,133 +9,130 @@ Apache 2.0 Ronaldson Bellande + catkin + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection + + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection + + ament_cmake + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection - - - - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection - - roscpp - roslib - std_msgs - sensor_msgs - geometry_msgs - humanoid_robot_controller_msgs - humanoid_robot_walking_module_msgs - humanoid_robot_action_module_msgs - cmake_modules - humanoid_robot_math - humanoid_robot_ball_detector - boost - eigen - yaml-cpp - humanoid_robot_manager - humanoid_robot_camera_setting_tool - humanoid_robot_web_setting_tool - ros_madplay_player - face_detection - + roscpp + roslib + std_msgs + sensor_msgs + geometry_msgs + humanoid_robot_controller_msgs + humanoid_robot_walking_module_msgs + humanoid_robot_action_module_msgs + cmake_modules + humanoid_robot_math + humanoid_robot_ball_detector + boost + eigen + yaml-cpp + humanoid_robot_manager + humanoid_robot_camera_setting_tool + humanoid_robot_web_setting_tool + ros_madplay_player + face_detection diff --git a/humanoid_robot_read_write_demo/package.xml b/humanoid_robot_read_write_demo/package.xml index 5c8ed9e..d2f8af4 100644 --- a/humanoid_robot_read_write_demo/package.xml +++ b/humanoid_robot_read_write_demo/package.xml @@ -1,7 +1,7 @@ humanoid_robot_read_write_demo - 0.3.0 + 0.3.2 The humanoid_robot_read_write_demo package