diff --git a/README.md b/README.md index ead026d..de9c256 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ## 📧 Explore the Docker image for the Bellande Robotic VPN: - **Robotic VPN**: [![ROS1 Docker Image](https://img.shields.io/docker/pulls/ronaldsonbellande/bellande_robotic_vpn)](https://hub.docker.com/r/ronaldsonbellande/bellande_robotic_vpn) -## Use the Web-ROS-API Docker Image for your needs with the Bellande API +## Use the Web-API Docker Image for your needs with the Bellande API - **ROS1**: [![ROS1 Docker Image](https://img.shields.io/docker/pulls/ronaldsonbellande/bellande_web_api_packages_ros1)](https://hub.docker.com/r/ronaldsonbellande/bellande_web_api_packages_ros1) - **ROS2**: [![ROS2 Docker Image](https://img.shields.io/docker/pulls/ronaldsonbellande/bellande_web_api_packages_ros2)](https://hub.docker.com/r/ronaldsonbellande/bellande_web_api_packages_ros2) @@ -44,6 +44,5 @@ The primary functionality of this API is to provide access to Bellande Algorithm To begin leveraging Bellande's algorithms in your projects, simply pull the Docker image and integrate the API into your robotic environment. Detailed instructions on how to deploy and utilize the API can be found in the provided documentation. - # License This API's is distributed under the [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) with all the code Publicly and Privately use case, see [LICENSE](https://github.com/RonaldsonBellande/bellande_web_ros_api/blob/main/LICENSE) and [NOTICE](https://github.com/RonaldsonBellande/bellande_web_ros_api/blob/main/LICENSE) for more information. diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/package.xml b/ros_web_api_bellande_adaptive_alternate_path_creation/package.xml deleted file mode 100644 index 533a2de..0000000 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/package.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - ros_web_api_bellande_adaptive_alternate_path_creation - 0.0.1 - Bellande ROS/ROS2 package with a JSON config file for making HTTP requests - Ronaldson Bellande - Ronaldson Bellande - Apache License 2.0 - - - catkin - - roscpp - rospy - - roscpp - rospy - - roscpp - rospy - - - ament_cmake - - rclcpp - rclpy - - rclcpp - rclpy - - rclcpp - rclpy - - - - - diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/package.xml b/ros_web_api_bellande_adaptive_continuious_control_system/package.xml deleted file mode 100644 index f874393..0000000 --- a/ros_web_api_bellande_adaptive_continuious_control_system/package.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - ros_web_api_bellande_adaptive_continuious_control_system - 0.0.1 - Bellande ROS/ROS2 package with a JSON config file for making HTTP requests - Ronaldson Bellande - Ronaldson Bellande - Apache License 2.0 - - - catkin - - roscpp - rospy - - roscpp - rospy - - roscpp - rospy - - - ament_cmake - - rclcpp - rclpy - - rclcpp - rclpy - - rclcpp - rclpy - - - - - diff --git a/ros_web_api_bellande_step/setup.py b/ros_web_api_bellande_step/setup.py deleted file mode 100755 index 5ec6985..0000000 --- a/ros_web_api_bellande_step/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -from distutils.core import setup -from catkin_pkg.python_setup import generate_distutils_setup - -# fetch values from package.xml -setup_args = generate_distutils_setup( - scripts=['src/bellande_step_api_2d.py'], - packages=['ros_web_api_bellande_step'], - package_dir={'': 'src'}, -) - -setup(**setup_args) diff --git a/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt b/web_api_bellande_2d_computer_vision/CMakeLists.txt similarity index 98% rename from ros_web_api_bellande_2d_computer_vision/CMakeLists.txt rename to web_api_bellande_2d_computer_vision/CMakeLists.txt index c18f3be..541f0f8 100644 --- a/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt +++ b/web_api_bellande_2d_computer_vision/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_2d_computer_vision) +project(web_api_bellande_2d_computer_vision) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_2d_computer_vision/README.md b/web_api_bellande_2d_computer_vision/README.md similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/README.md rename to web_api_bellande_2d_computer_vision/README.md diff --git a/ros_web_api_bellande_2d_computer_vision/config/configs.json b/web_api_bellande_2d_computer_vision/config/configs.json similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/config/configs.json rename to web_api_bellande_2d_computer_vision/config/configs.json diff --git a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py similarity index 84% rename from ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py rename to web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py index 1dc94fa..0f5cf97 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py +++ b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_face_detection.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.launch"] + args roslaunch_command.extend([ "usb_cam", "usb_cam_node", "name:=camera", @@ -40,12 +40,12 @@ def ros1_launch_description(): ]) roslaunch_command.extend([ - "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" + "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" + "args:=-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" ]) # Execute the launch command @@ -72,7 +72,7 @@ def ros2_launch_description(): )) nodes_to_launch.append(Node( - package='ros_web_api_bellande_2d_computer_vision', + package='web_api_bellande_2d_computer_vision', executable='bellande_2d_computer_vision_face_detection.py', name='face_detection_node', output='screen', @@ -83,7 +83,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py similarity index 84% rename from ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py rename to web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py index 1dc94fa..0f5cf97 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py +++ b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_instance_segmentation.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.launch"] + args roslaunch_command.extend([ "usb_cam", "usb_cam_node", "name:=camera", @@ -40,12 +40,12 @@ def ros1_launch_description(): ]) roslaunch_command.extend([ - "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" + "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" + "args:=-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" ]) # Execute the launch command @@ -72,7 +72,7 @@ def ros2_launch_description(): )) nodes_to_launch.append(Node( - package='ros_web_api_bellande_2d_computer_vision', + package='web_api_bellande_2d_computer_vision', executable='bellande_2d_computer_vision_face_detection.py', name='face_detection_node', output='screen', @@ -83,7 +83,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py similarity index 84% rename from ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py rename to web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py index 16ae336..3c933db 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py +++ b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_object_detection.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_object_detection.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_object_detection.launch"] + args roslaunch_command.extend([ "usb_cam", "usb_cam_node", "name:=camera", @@ -40,12 +40,12 @@ def ros1_launch_description(): ]) roslaunch_command.extend([ - "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" + "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_face_detection.py", "name:=face_detection_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" + "args:=-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" ]) # Execute the launch command @@ -72,7 +72,7 @@ def ros2_launch_description(): )) nodes_to_launch.append(Node( - package='ros_web_api_bellande_2d_computer_vision', + package='web_api_bellande_2d_computer_vision', executable='bellande_2d_computer_vision_face_detection.py', name='face_detection_node', output='screen', @@ -83,7 +83,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py similarity index 84% rename from ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py rename to web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py index 8365a6e..9be5d81 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py +++ b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_prediction.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_prediction.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_prediction.launch"] + args roslaunch_command.extend([ "usb_cam", "usb_cam_node", "name:=camera", @@ -40,12 +40,12 @@ def ros1_launch_description(): ]) roslaunch_command.extend([ - "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_prediction.py", "name:=prediction_node" + "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_prediction.py", "name:=prediction_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" + "args:=-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" ]) # Execute the launch command @@ -72,7 +72,7 @@ def ros2_launch_description(): )) nodes_to_launch.append(Node( - package='ros_web_api_bellande_2d_computer_vision', + package='web_api_bellande_2d_computer_vision', executable='bellande_2d_computer_vision_prediction.py', name='prediction_node', output='screen', @@ -83,7 +83,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py similarity index 83% rename from ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py rename to web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py index 5c2622e..4b9eb3f 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py +++ b/web_api_bellande_2d_computer_vision/launch/bellande_2d_computer_vision_semantic_segmentation.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_semantic_segmentation.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_semantic_segmentation.launch"] + args roslaunch_command.extend([ "usb_cam", "usb_cam_node", "name:=camera", @@ -40,12 +40,12 @@ def ros1_launch_description(): ]) roslaunch_command.extend([ - "ros_web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_semantic_segmentation.py", "name:=face_detection_node" + "web_api_bellande_2d_computer_vision", "bellande_2d_computer_vision_semantic_segmentation.py", "name:=face_detection_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" + "args:=-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" ]) # Execute the launch command @@ -72,7 +72,7 @@ def ros2_launch_description(): )) nodes_to_launch.append(Node( - package='ros_web_api_bellande_2d_computer_vision', + package='web_api_bellande_2d_computer_vision', executable='bellande_2d_computer_vision_semantic_segmentation.py', name='face_detection_node', output='screen', @@ -83,7 +83,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch similarity index 88% rename from ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch rename to web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch index 88202f2..77ea9c9 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch +++ b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_face_detection.launch @@ -25,13 +25,13 @@ along with this program. If not, see . - + args="-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" /> diff --git a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch similarity index 88% rename from ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch rename to web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch index 21fefc9..3d04362 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch +++ b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_instance_segmentation.launch @@ -25,13 +25,13 @@ along with this program. If not, see . - + args="-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" /> diff --git a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch similarity index 88% rename from ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch rename to web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch index d4d411a..dfd1e16 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch +++ b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_object_detection.launch @@ -25,13 +25,13 @@ along with this program. If not, see . - + args="-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" /> diff --git a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch similarity index 88% rename from ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch rename to web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch index b1674e8..9b6f1c4 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch +++ b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_prediction.launch @@ -25,12 +25,12 @@ along with this program. If not, see . - + args="-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" /> diff --git a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch similarity index 88% rename from ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch rename to web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch index 80e5745..ad3198e 100644 --- a/ros_web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch +++ b/web_api_bellande_2d_computer_vision/launch/ros1/bellande_2d_computer_vision_semantic_segmentation.launch @@ -25,13 +25,13 @@ along with this program. If not, see . - + args="-d $(find web_api_bellande_2d_computer_vision)/rviz/visualization.rviz" /> diff --git a/ros_web_api_bellande_speech_detection/package.xml b/web_api_bellande_2d_computer_vision/package.xml similarity index 97% rename from ros_web_api_bellande_speech_detection/package.xml rename to web_api_bellande_2d_computer_vision/package.xml index 9c038c5..4b15d2c 100644 --- a/ros_web_api_bellande_speech_detection/package.xml +++ b/web_api_bellande_2d_computer_vision/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_speech_detection + web_api_bellande_2d_computer_vision 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_2d_computer_vision/rviz/visualization.rviz b/web_api_bellande_2d_computer_vision/rviz/visualization.rviz similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/rviz/visualization.rviz rename to web_api_bellande_2d_computer_vision/rviz/visualization.rviz diff --git a/ros_web_api_bellande_2d_computer_vision/setup.py b/web_api_bellande_2d_computer_vision/setup.py similarity index 95% rename from ros_web_api_bellande_2d_computer_vision/setup.py rename to web_api_bellande_2d_computer_vision/setup.py index e070371..7202b10 100755 --- a/ros_web_api_bellande_2d_computer_vision/setup.py +++ b/web_api_bellande_2d_computer_vision/setup.py @@ -19,7 +19,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_2d_computer_vision_prediction.py', 'src/bellande_2d_computer_vision_face_detection.py', 'src/bellande_2d_computer_vision_object_detection.py', 'src/bellande_2d_computer_vision_instance_segmentation.py', 'src/bellande_2d_computer_vision_semantic_segmentation.py'], - packages=['ros_web_api_bellande_2d_computer_vision'], + packages=['web_api_bellande_2d_computer_vision'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_face_detection.py b/web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_face_detection.py similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_face_detection.py rename to web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_face_detection.py diff --git a/ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_instance_segmentation.py b/web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_instance_segmentation.py similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_instance_segmentation.py rename to web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_instance_segmentation.py diff --git a/ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_object_detection.py b/web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_object_detection.py similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_object_detection.py rename to web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_object_detection.py diff --git a/ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_prediction.py b/web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_prediction.py similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_prediction.py rename to web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_prediction.py diff --git a/ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_semantic_segmentation.py b/web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_semantic_segmentation.py similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_semantic_segmentation.py rename to web_api_bellande_2d_computer_vision/src/bellande_2d_computer_vision_semantic_segmentation.py diff --git a/ros_web_api_bellande_2d_computer_vision/yaml/object_detection_params.yaml b/web_api_bellande_2d_computer_vision/yaml/object_detection_params.yaml similarity index 100% rename from ros_web_api_bellande_2d_computer_vision/yaml/object_detection_params.yaml rename to web_api_bellande_2d_computer_vision/yaml/object_detection_params.yaml diff --git a/ros_web_api_bellande_3d_computer_vision/CMakeLists.txt b/web_api_bellande_3d_computer_vision/CMakeLists.txt similarity index 98% rename from ros_web_api_bellande_3d_computer_vision/CMakeLists.txt rename to web_api_bellande_3d_computer_vision/CMakeLists.txt index 245fea1..e51ff44 100644 --- a/ros_web_api_bellande_3d_computer_vision/CMakeLists.txt +++ b/web_api_bellande_3d_computer_vision/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_3d_computer_vision) +project(web_api_bellande_3d_computer_vision) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_3d_computer_vision/README.md b/web_api_bellande_3d_computer_vision/README.md similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/README.md rename to web_api_bellande_3d_computer_vision/README.md diff --git a/ros_web_api_bellande_3d_computer_vision/config/configs.json b/web_api_bellande_3d_computer_vision/config/configs.json similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/config/configs.json rename to web_api_bellande_3d_computer_vision/config/configs.json diff --git a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py similarity index 77% rename from ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py rename to web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py index 3c63927..3b827ee 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py +++ b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_instance_segmentation.launch.py @@ -26,20 +26,20 @@ from launch.substitutions import LaunchConfiguration def ros1_launch_description(): args = sys.argv[1:] - roslaunch_command = ["roslaunch", "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.launch"] + args roslaunch_command.extend([ "param", "config_file", - "value:=$(find ros_web_api_bellande_3d_computer_vision)/config/configs.json" + "value:=$(find web_api_bellande_3d_computer_vision)/config/configs.json" ]) roslaunch_command.extend([ - "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.py", "name:=pointcloud_prediction_node" + "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.py", "name:=pointcloud_prediction_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" + "args:=-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" ]) subprocess.call(roslaunch_command) @@ -49,7 +49,7 @@ def ros2_launch_description(): nodes_to_launch = [] nodes_to_launch.append(Node( - package='ros_web_api_bellande_3d_computer_vision', + package='web_api_bellande_3d_computer_vision', executable='bellande_3d_computer_vision_prediction.py', name='pointcloud_prediction_node', output='screen', @@ -61,7 +61,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py similarity index 76% rename from ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py rename to web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py index 9c7ed40..a932764 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py +++ b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_object_detection.launch.py @@ -26,20 +26,20 @@ from launch.substitutions import LaunchConfiguration def ros1_launch_description(): args = sys.argv[1:] - roslaunch_command = ["roslaunch", "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_object_detection.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_object_detection.launch"] + args roslaunch_command.extend([ "param", "config_file", - "value:=$(find ros_web_api_bellande_3d_computer_vision)/config/configs.json" + "value:=$(find web_api_bellande_3d_computer_vision)/config/configs.json" ]) roslaunch_command.extend([ - "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_object_detection.py", "name:=pointcloud_object_detection_node" + "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_object_detection.py", "name:=pointcloud_object_detection_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" + "args:=-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" ]) subprocess.call(roslaunch_command) @@ -49,7 +49,7 @@ def ros2_launch_description(): nodes_to_launch = [] nodes_to_launch.append(Node( - package='ros_web_api_bellande_3d_computer_vision', + package='web_api_bellande_3d_computer_vision', executable='pointcloud_object_detection_node.py', name='pointcloud_object_detection_node', output='screen', @@ -61,7 +61,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py similarity index 77% rename from ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py rename to web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py index 3c63927..3b827ee 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py +++ b/web_api_bellande_3d_computer_vision/launch/bellande_3d_computer_vision_prediction.launch.py @@ -26,20 +26,20 @@ from launch.substitutions import LaunchConfiguration def ros1_launch_description(): args = sys.argv[1:] - roslaunch_command = ["roslaunch", "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.launch"] + args roslaunch_command.extend([ "param", "config_file", - "value:=$(find ros_web_api_bellande_3d_computer_vision)/config/configs.json" + "value:=$(find web_api_bellande_3d_computer_vision)/config/configs.json" ]) roslaunch_command.extend([ - "ros_web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.py", "name:=pointcloud_prediction_node" + "web_api_bellande_3d_computer_vision", "bellande_3d_computer_vision_prediction.py", "name:=pointcloud_prediction_node" ]) roslaunch_command.extend([ "rviz", "rviz", "name:=rviz", - "args:=-d $(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" + "args:=-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" ]) subprocess.call(roslaunch_command) @@ -49,7 +49,7 @@ def ros2_launch_description(): nodes_to_launch = [] nodes_to_launch.append(Node( - package='ros_web_api_bellande_3d_computer_vision', + package='web_api_bellande_3d_computer_vision', executable='bellande_3d_computer_vision_prediction.py', name='pointcloud_prediction_node', output='screen', @@ -61,7 +61,7 @@ def ros2_launch_description(): package='rviz2', executable='rviz2', name='rviz', - arguments=['-d', '$(find ros_web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] + arguments=['-d', '$(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz'] )) return LaunchDescription(nodes_to_launch) diff --git a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch similarity index 78% rename from ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch rename to web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch index ac6e1ab..97f1525 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch +++ b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_instance_segmentation.launch @@ -17,14 +17,14 @@ along with this program. If not, see . --> + value="$(find web_api_bellande_3d_computer_vision)/config/configs.json" /> - + args="-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" /> diff --git a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch similarity index 77% rename from ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch rename to web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch index 3203fe5..f5ebdf3 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch +++ b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_object_detection.launch @@ -17,14 +17,14 @@ along with this program. If not, see . --> + value="$(find web_api_bellande_3d_computer_vision)/config/configs.json" /> - + args="-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" /> diff --git a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch similarity index 78% rename from ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch rename to web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch index ac6e1ab..97f1525 100644 --- a/ros_web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch +++ b/web_api_bellande_3d_computer_vision/launch/ros1/bellande_3d_computer_vision_prediction.launch @@ -17,14 +17,14 @@ along with this program. If not, see . --> + value="$(find web_api_bellande_3d_computer_vision)/config/configs.json" /> - + args="-d $(find web_api_bellande_3d_computer_vision)/rviz/pointcloud_visualization.rviz" /> diff --git a/ros_web_api_bellande_3d_computer_vision/package.xml b/web_api_bellande_3d_computer_vision/package.xml similarity index 97% rename from ros_web_api_bellande_3d_computer_vision/package.xml rename to web_api_bellande_3d_computer_vision/package.xml index 9c0140d..a49b2a0 100644 --- a/ros_web_api_bellande_3d_computer_vision/package.xml +++ b/web_api_bellande_3d_computer_vision/package.xml @@ -17,7 +17,7 @@ along with this program. If not, see . --> - ros_web_api_bellande_3d_computer_vision + web_api_bellande_3d_computer_vision 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_3d_computer_vision/rviz/pointcloud_visualization.rviz b/web_api_bellande_3d_computer_vision/rviz/pointcloud_visualization.rviz similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/rviz/pointcloud_visualization.rviz rename to web_api_bellande_3d_computer_vision/rviz/pointcloud_visualization.rviz diff --git a/ros_web_api_bellande_3d_computer_vision/setup.py b/web_api_bellande_3d_computer_vision/setup.py similarity index 87% rename from ros_web_api_bellande_3d_computer_vision/setup.py rename to web_api_bellande_3d_computer_vision/setup.py index 4351824..c867d37 100755 --- a/ros_web_api_bellande_3d_computer_vision/setup.py +++ b/web_api_bellande_3d_computer_vision/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_3d_computer_vision_prediction.py', 'src/bellande_3d_computer_vision_object_detection.py', 'src/bellande_3d_computer_vision_instance_segmentation.py'], - packages=['ros_web_api_bellande_3d_computer_vision'], + packages=['web_api_bellande_3d_computer_vision'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_instance_segmentation.py b/web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_instance_segmentation.py similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_instance_segmentation.py rename to web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_instance_segmentation.py diff --git a/ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_object_detection.py b/web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_object_detection.py similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_object_detection.py rename to web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_object_detection.py diff --git a/ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_prediction.py b/web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_prediction.py similarity index 100% rename from ros_web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_prediction.py rename to web_api_bellande_3d_computer_vision/src/bellande_3d_computer_vision_prediction.py diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt b/web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt similarity index 96% rename from ros_web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt rename to web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt index 533cc0a..2f17c8c 100644 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt +++ b/web_api_bellande_adaptive_alternate_path_creation/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_adaptive_alternate_path_creation) +project(web_api_bellande_adaptive_alternate_path_creation) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/README.md b/web_api_bellande_adaptive_alternate_path_creation/README.md similarity index 100% rename from ros_web_api_bellande_adaptive_alternate_path_creation/README.md rename to web_api_bellande_adaptive_alternate_path_creation/README.md diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/config/configs.json b/web_api_bellande_adaptive_alternate_path_creation/config/configs.json similarity index 100% rename from ros_web_api_bellande_adaptive_alternate_path_creation/config/configs.json rename to web_api_bellande_adaptive_alternate_path_creation/config/configs.json diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py b/web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py similarity index 92% rename from ros_web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py rename to web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py index be7af43..2fa5e1b 100644 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py +++ b/web_api_bellande_adaptive_alternate_path_creation/launch/bellande_adaptive_alternate_path_creation.launch.py @@ -12,7 +12,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_step", "bellande_step_api_2d.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_step", "bellande_step_api_2d.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -34,7 +34,7 @@ def ros2_launch_description(): x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_step', + package='web_api_bellande_step', executable='bellande_step_api_2d.py', name='bellande_step_api_2d_node', output='screen', diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch b/web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch similarity index 93% rename from ros_web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch rename to web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch index 15edced..0c42faf 100644 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch +++ b/web_api_bellande_adaptive_alternate_path_creation/launch/ros1/bellande_adaptive_alternate_path_creation.launch @@ -21,7 +21,7 @@ the License. - diff --git a/ros_web_api_bellande_extremum_optimization/package.xml b/web_api_bellande_adaptive_alternate_path_creation/package.xml similarity index 97% rename from ros_web_api_bellande_extremum_optimization/package.xml rename to web_api_bellande_adaptive_alternate_path_creation/package.xml index f5b637d..bbee498 100644 --- a/ros_web_api_bellande_extremum_optimization/package.xml +++ b/web_api_bellande_adaptive_alternate_path_creation/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_extremum_optimization + web_api_bellande_adaptive_alternate_path_creation 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_motion_probabilistic/script/build.sh b/web_api_bellande_adaptive_alternate_path_creation/script/build.sh similarity index 67% rename from ros_web_api_bellande_motion_probabilistic/script/build.sh rename to web_api_bellande_adaptive_alternate_path_creation/script/build.sh index 78e4cf0..c4da481 100644 --- a/ros_web_api_bellande_motion_probabilistic/script/build.sh +++ b/web_api_bellande_adaptive_alternate_path_creation/script/build.sh @@ -23,7 +23,7 @@ cd .. # Run ROS launch file if [ $ROS_VERSION -eq 1 ]; then - roslaunch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + roslaunch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 else - ros2 launch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + ros2 launch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 fi diff --git a/ros_web_api_bellande_search_path/setup.py b/web_api_bellande_adaptive_alternate_path_creation/setup.py similarity index 85% rename from ros_web_api_bellande_search_path/setup.py rename to web_api_bellande_adaptive_alternate_path_creation/setup.py index 5ec6985..5752cee 100755 --- a/ros_web_api_bellande_search_path/setup.py +++ b/web_api_bellande_adaptive_alternate_path_creation/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_step_api_2d.py'], - packages=['ros_web_api_bellande_step'], + packages=['web_api_bellande_step'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/src/bellande_adaptive_alternate_path_creation.py b/web_api_bellande_adaptive_alternate_path_creation/src/bellande_adaptive_alternate_path_creation.py similarity index 100% rename from ros_web_api_bellande_adaptive_alternate_path_creation/src/bellande_adaptive_alternate_path_creation.py rename to web_api_bellande_adaptive_alternate_path_creation/src/bellande_adaptive_alternate_path_creation.py diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt b/web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt similarity index 96% rename from ros_web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt rename to web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt index 725e12e..c6e3343 100644 --- a/ros_web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt +++ b/web_api_bellande_adaptive_continuious_control_system/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_adaptive_continuious_control_system) +project(web_api_bellande_adaptive_continuious_control_system) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/README.md b/web_api_bellande_adaptive_continuious_control_system/README.md similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_control_system/README.md rename to web_api_bellande_adaptive_continuious_control_system/README.md diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/config/configs.json b/web_api_bellande_adaptive_continuious_control_system/config/configs.json similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_control_system/config/configs.json rename to web_api_bellande_adaptive_continuious_control_system/config/configs.json diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py b/web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py similarity index 90% rename from ros_web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py rename to web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py index 8bad798..b04752b 100644 --- a/ros_web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py +++ b/web_api_bellande_adaptive_continuious_control_system/launch/bellande_control_system.launch.py @@ -23,7 +23,7 @@ from launch.substitutions import LaunchConfiguration def ros1_launch_description(): args = sys.argv[1:] - roslaunch_command = ["roslaunch", "ros_web_api_bellande_adaptive_continuious_control_system", "bellande_control_system.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_adaptive_continuious_control_system", "bellande_control_system.launch"] + args subprocess.call(roslaunch_command) def ros2_launch_description(): @@ -36,7 +36,7 @@ def ros2_launch_description(): ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_adaptive_continuious_control_system', + package='web_api_bellande_adaptive_continuious_control_system', executable='bellande_control_system.py', name='bellande_control_system_node', output='screen', diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/launch/ros1/bellande_control_system.launch b/web_api_bellande_adaptive_continuious_control_system/launch/ros1/bellande_control_system.launch similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_control_system/launch/ros1/bellande_control_system.launch rename to web_api_bellande_adaptive_continuious_control_system/launch/ros1/bellande_control_system.launch diff --git a/ros_web_api_bellande_adaptive_continuious_controller/package.xml b/web_api_bellande_adaptive_continuious_control_system/package.xml similarity index 97% rename from ros_web_api_bellande_adaptive_continuious_controller/package.xml rename to web_api_bellande_adaptive_continuious_control_system/package.xml index b60e1b0..6b6967f 100644 --- a/ros_web_api_bellande_adaptive_continuious_controller/package.xml +++ b/web_api_bellande_adaptive_continuious_control_system/package.xml @@ -17,7 +17,7 @@ along with this program. If not, see . --> - ros_web_api_bellande_adaptive_continuious_controller + web_api_bellande_adaptive_continuious_control_system 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/setup.py b/web_api_bellande_adaptive_continuious_control_system/setup.py similarity index 93% rename from ros_web_api_bellande_adaptive_continuious_control_system/setup.py rename to web_api_bellande_adaptive_continuious_control_system/setup.py index 5b57e1d..d6768f6 100755 --- a/ros_web_api_bellande_adaptive_continuious_control_system/setup.py +++ b/web_api_bellande_adaptive_continuious_control_system/setup.py @@ -19,7 +19,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_control_system.py'], - packages=['ros_web_api_bellande_adaptive_continuious_control_system'], + packages=['web_api_bellande_adaptive_continuious_control_system'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_adaptive_continuious_control_system/src/bellande_control_system.py b/web_api_bellande_adaptive_continuious_control_system/src/bellande_control_system.py similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_control_system/src/bellande_control_system.py rename to web_api_bellande_adaptive_continuious_control_system/src/bellande_control_system.py diff --git a/ros_web_api_bellande_adaptive_continuious_controller/CMakeLists.txt b/web_api_bellande_adaptive_continuious_controller/CMakeLists.txt similarity index 96% rename from ros_web_api_bellande_adaptive_continuious_controller/CMakeLists.txt rename to web_api_bellande_adaptive_continuious_controller/CMakeLists.txt index 3f5c5d7..32495da 100644 --- a/ros_web_api_bellande_adaptive_continuious_controller/CMakeLists.txt +++ b/web_api_bellande_adaptive_continuious_controller/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_adaptive_continuious_controller) +project(web_api_bellande_adaptive_continuious_controller) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_adaptive_continuious_controller/README.md b/web_api_bellande_adaptive_continuious_controller/README.md similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_controller/README.md rename to web_api_bellande_adaptive_continuious_controller/README.md diff --git a/ros_web_api_bellande_adaptive_continuious_controller/config/configs.json b/web_api_bellande_adaptive_continuious_controller/config/configs.json similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_controller/config/configs.json rename to web_api_bellande_adaptive_continuious_controller/config/configs.json diff --git a/ros_web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py b/web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py similarity index 92% rename from ros_web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py rename to web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py index cb9beae..201b320 100644 --- a/ros_web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py +++ b/web_api_bellande_adaptive_continuious_controller/launch/bellande_controller.launch.py @@ -25,7 +25,7 @@ def ros1_launch_description(): # Get command-line arguments args = sys.argv[1:] # Construct the ROS 1 launch command - roslaunch_command = ["roslaunch", "ros_web_api_bellande_adaptive_continuious_controller", "bellande_controller.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_adaptive_continuious_controller", "bellande_controller.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -44,7 +44,7 @@ def ros2_launch_description(): ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_adaptive_continuious_controller', + package='web_api_bellande_adaptive_continuious_controller', executable='bellande_controller.py', name='bellande_controller_node', output='screen', diff --git a/ros_web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch b/web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch similarity index 88% rename from ros_web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch rename to web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch index 48b4b18..f20a2db 100644 --- a/ros_web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch +++ b/web_api_bellande_adaptive_continuious_controller/launch/ros1/bellande_controller.launch @@ -24,7 +24,7 @@ along with this program. If not, see . - + diff --git a/ros_web_api_bellande_motion_probabilistic/package.xml b/web_api_bellande_adaptive_continuious_controller/package.xml similarity index 97% rename from ros_web_api_bellande_motion_probabilistic/package.xml rename to web_api_bellande_adaptive_continuious_controller/package.xml index a483144..58b9da0 100644 --- a/ros_web_api_bellande_motion_probabilistic/package.xml +++ b/web_api_bellande_adaptive_continuious_controller/package.xml @@ -15,8 +15,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . --> + - ros_web_api_bellande_motion_probabilistic + web_api_bellande_adaptive_continuious_controller 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_adaptive_continuious_controller/setup.py b/web_api_bellande_adaptive_continuious_controller/setup.py similarity index 93% rename from ros_web_api_bellande_adaptive_continuious_controller/setup.py rename to web_api_bellande_adaptive_continuious_controller/setup.py index b46d54f..2813e99 100755 --- a/ros_web_api_bellande_adaptive_continuious_controller/setup.py +++ b/web_api_bellande_adaptive_continuious_controller/setup.py @@ -19,7 +19,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_controller.py'], - packages=['ros_web_api_bellande_adaptive_continuious_controller'], + packages=['web_api_bellande_adaptive_continuious_controller'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_adaptive_continuious_controller/src/bellande_controller.py b/web_api_bellande_adaptive_continuious_controller/src/bellande_controller.py similarity index 100% rename from ros_web_api_bellande_adaptive_continuious_controller/src/bellande_controller.py rename to web_api_bellande_adaptive_continuious_controller/src/bellande_controller.py diff --git a/ros_web_api_bellande_ai_system/CMakeLists.txt b/web_api_bellande_ai_system/CMakeLists.txt similarity index 98% rename from ros_web_api_bellande_ai_system/CMakeLists.txt rename to web_api_bellande_ai_system/CMakeLists.txt index 3447650..3e6c2a8 100644 --- a/ros_web_api_bellande_ai_system/CMakeLists.txt +++ b/web_api_bellande_ai_system/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_ai_system) +project(web_api_bellande_ai_system) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_step/README.md b/web_api_bellande_ai_system/README.md similarity index 50% rename from ros_web_api_bellande_step/README.md rename to web_api_bellande_ai_system/README.md index c6e3257..64ba614 100644 --- a/ros_web_api_bellande_step/README.md +++ b/web_api_bellande_ai_system/README.md @@ -4,7 +4,7 @@ # ROS1 Launch - python3 bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 -- roslaunch ros_web_api_bellande_step bellande_step_api_2d.launch x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 +- roslaunch web_api_bellande_step bellande_step_api_2d.launch x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 # ROS2 Launch -- ros2 launch ros_web_api_bellande_step bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 +- ros2 launch web_api_bellande_step bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 diff --git a/ros_web_api_bellande_ai_system/config/configs.json b/web_api_bellande_ai_system/config/configs.json similarity index 100% rename from ros_web_api_bellande_ai_system/config/configs.json rename to web_api_bellande_ai_system/config/configs.json diff --git a/ros_web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py b/web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py similarity index 90% rename from ros_web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py rename to web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py index 583a73c..f911e70 100644 --- a/ros_web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py +++ b/web_api_bellande_ai_system/launch/bellande_ai_system_base.launch.py @@ -25,7 +25,7 @@ def ros1_launch_description(): # Get command-line arguments args = sys.argv[1:] # Construct the ROS 1 launch command - roslaunch_command = ["roslaunch", "ros_web_api_bellande_ai_system", "bellande_ai_system_base.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_ai_system", "bellande_ai_system_base.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -33,7 +33,7 @@ def ros2_launch_description(): # Declare launch arguments config_file_arg = DeclareLaunchArgument( 'config_file', - default_value='$(find ros_web_api_bellande_ai_system)/config/configs.json', + default_value='$(find web_api_bellande_ai_system)/config/configs.json', description='Path to the AI system configuration file' ) @@ -44,7 +44,7 @@ def ros2_launch_description(): ros_launch_arguments = [config_file_arg] nodes_to_launch.append(Node( - package='ros_web_api_bellande_ai_system', + package='web_api_bellande_ai_system', executable='bellande_ai_system_base.py', name='bellande_ai_system_base_node', output='screen', diff --git a/ros_web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py b/web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py similarity index 90% rename from ros_web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py rename to web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py index 9296bb6..d23b9a1 100644 --- a/ros_web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py +++ b/web_api_bellande_ai_system/launch/bellande_ai_system_command.launch.py @@ -25,7 +25,7 @@ def ros1_launch_description(): # Get command-line arguments args = sys.argv[1:] # Construct the ROS 1 launch command - roslaunch_command = ["roslaunch", "ros_web_api_bellande_ai_system", "bellande_ai_system_command.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_ai_system", "bellande_ai_system_command.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -33,7 +33,7 @@ def ros2_launch_description(): # Declare launch arguments config_file_arg = DeclareLaunchArgument( 'config_file', - default_value='$(find ros_web_api_bellande_ai_system)/config/configs.json', + default_value='$(find web_api_bellande_ai_system)/config/configs.json', description='Path to the AI system configuration file' ) @@ -44,7 +44,7 @@ def ros2_launch_description(): ros_launch_arguments = [config_file_arg] nodes_to_launch.append(Node( - package='ros_web_api_bellande_ai_system', + package='web_api_bellande_ai_system', executable='bellande_ai_system_command.py', name='bellande_ai_system_command_node', output='screen', diff --git a/ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch b/web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch similarity index 85% rename from ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch rename to web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch index 54cd1e2..fb1ceca 100644 --- a/ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch +++ b/web_api_bellande_ai_system/launch/ros1/bellande_ai_system_base.launch @@ -18,11 +18,11 @@ along with this program. If not, see . - + - diff --git a/ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch b/web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch similarity index 85% rename from ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch rename to web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch index e811805..851f84c 100644 --- a/ros_web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch +++ b/web_api_bellande_ai_system/launch/ros1/bellande_ai_system_command.launch @@ -18,11 +18,11 @@ along with this program. If not, see . - + - diff --git a/ros_web_api_bellande_ai_system/package.xml b/web_api_bellande_ai_system/package.xml similarity index 97% rename from ros_web_api_bellande_ai_system/package.xml rename to web_api_bellande_ai_system/package.xml index 68fc11b..807039f 100644 --- a/ros_web_api_bellande_ai_system/package.xml +++ b/web_api_bellande_ai_system/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_ai_system + web_api_bellande_ai_system 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_ai_system/setup.py b/web_api_bellande_ai_system/setup.py similarity index 95% rename from ros_web_api_bellande_ai_system/setup.py rename to web_api_bellande_ai_system/setup.py index f910ebb..6dc9ced 100755 --- a/ros_web_api_bellande_ai_system/setup.py +++ b/web_api_bellande_ai_system/setup.py @@ -19,7 +19,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=["src/bellande_ai_system_base.py", "src/bellande_ai_system_command.py"], - packages=['ros_web_api_bellande_ai_system'], + packages=['web_api_bellande_ai_system'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_ai_system/src/bellande_ai_system_base.py b/web_api_bellande_ai_system/src/bellande_ai_system_base.py similarity index 100% rename from ros_web_api_bellande_ai_system/src/bellande_ai_system_base.py rename to web_api_bellande_ai_system/src/bellande_ai_system_base.py diff --git a/ros_web_api_bellande_ai_system/src/bellande_ai_system_command.py b/web_api_bellande_ai_system/src/bellande_ai_system_command.py similarity index 100% rename from ros_web_api_bellande_ai_system/src/bellande_ai_system_command.py rename to web_api_bellande_ai_system/src/bellande_ai_system_command.py diff --git a/ros_web_api_bellande_motion_probabilistic/CMakeLists.txt b/web_api_bellande_extremum_optimization/CMakeLists.txt similarity index 97% rename from ros_web_api_bellande_motion_probabilistic/CMakeLists.txt rename to web_api_bellande_extremum_optimization/CMakeLists.txt index d81fa5b..548d2b8 100644 --- a/ros_web_api_bellande_motion_probabilistic/CMakeLists.txt +++ b/web_api_bellande_extremum_optimization/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_motion_probabilistic) +project(web_api_bellande_extremum_optimization) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_extremum_optimization/README.md b/web_api_bellande_extremum_optimization/README.md similarity index 100% rename from ros_web_api_bellande_extremum_optimization/README.md rename to web_api_bellande_extremum_optimization/README.md diff --git a/ros_web_api_bellande_extremum_optimization/config/configs.json b/web_api_bellande_extremum_optimization/config/configs.json similarity index 100% rename from ros_web_api_bellande_extremum_optimization/config/configs.json rename to web_api_bellande_extremum_optimization/config/configs.json diff --git a/ros_web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py b/web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py similarity index 92% rename from ros_web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py rename to web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py index be7af43..2fa5e1b 100644 --- a/ros_web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py +++ b/web_api_bellande_extremum_optimization/launch/bellande_extremum_optimization.launch.py @@ -12,7 +12,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_step", "bellande_step_api_2d.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_step", "bellande_step_api_2d.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -34,7 +34,7 @@ def ros2_launch_description(): x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_step', + package='web_api_bellande_step', executable='bellande_step_api_2d.py', name='bellande_step_api_2d_node', output='screen', diff --git a/ros_web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch b/web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch similarity index 93% rename from ros_web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch rename to web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch index 15edced..0c42faf 100644 --- a/ros_web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch +++ b/web_api_bellande_extremum_optimization/launch/ros1/bellande_extremum_optimization.launch @@ -21,7 +21,7 @@ the License. - diff --git a/ros_web_api_bellande_2d_computer_vision/package.xml b/web_api_bellande_extremum_optimization/package.xml similarity index 97% rename from ros_web_api_bellande_2d_computer_vision/package.xml rename to web_api_bellande_extremum_optimization/package.xml index fc92efc..ceba027 100644 --- a/ros_web_api_bellande_2d_computer_vision/package.xml +++ b/web_api_bellande_extremum_optimization/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_2d_computer_vision + web_api_bellande_extremum_optimization 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/script/build.sh b/web_api_bellande_extremum_optimization/script/build.sh similarity index 67% rename from ros_web_api_bellande_adaptive_alternate_path_creation/script/build.sh rename to web_api_bellande_extremum_optimization/script/build.sh index 78e4cf0..c4da481 100644 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/script/build.sh +++ b/web_api_bellande_extremum_optimization/script/build.sh @@ -23,7 +23,7 @@ cd .. # Run ROS launch file if [ $ROS_VERSION -eq 1 ]; then - roslaunch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + roslaunch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 else - ros2 launch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + ros2 launch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 fi diff --git a/ros_web_api_bellande_adaptive_alternate_path_creation/setup.py b/web_api_bellande_extremum_optimization/setup.py similarity index 85% rename from ros_web_api_bellande_adaptive_alternate_path_creation/setup.py rename to web_api_bellande_extremum_optimization/setup.py index 5ec6985..5752cee 100755 --- a/ros_web_api_bellande_adaptive_alternate_path_creation/setup.py +++ b/web_api_bellande_extremum_optimization/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_step_api_2d.py'], - packages=['ros_web_api_bellande_step'], + packages=['web_api_bellande_step'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_extremum_optimization/src/bellande_extremum_optimization.py b/web_api_bellande_extremum_optimization/src/bellande_extremum_optimization.py similarity index 100% rename from ros_web_api_bellande_extremum_optimization/src/bellande_extremum_optimization.py rename to web_api_bellande_extremum_optimization/src/bellande_extremum_optimization.py diff --git a/ros_web_api_bellande_extremum_optimization/CMakeLists.txt b/web_api_bellande_motion_probabilistic/CMakeLists.txt similarity index 97% rename from ros_web_api_bellande_extremum_optimization/CMakeLists.txt rename to web_api_bellande_motion_probabilistic/CMakeLists.txt index f598c12..0a54e51 100644 --- a/ros_web_api_bellande_extremum_optimization/CMakeLists.txt +++ b/web_api_bellande_motion_probabilistic/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_extremum_optimization) +project(web_api_bellande_motion_probabilistic) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_motion_probabilistic/README.md b/web_api_bellande_motion_probabilistic/README.md similarity index 100% rename from ros_web_api_bellande_motion_probabilistic/README.md rename to web_api_bellande_motion_probabilistic/README.md diff --git a/ros_web_api_bellande_motion_probabilistic/config/configs.json b/web_api_bellande_motion_probabilistic/config/configs.json similarity index 100% rename from ros_web_api_bellande_motion_probabilistic/config/configs.json rename to web_api_bellande_motion_probabilistic/config/configs.json diff --git a/ros_web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py b/web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py similarity index 92% rename from ros_web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py rename to web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py index be7af43..2fa5e1b 100644 --- a/ros_web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py +++ b/web_api_bellande_motion_probabilistic/launch/bellande_motion_probabilistic.launch.py @@ -12,7 +12,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_step", "bellande_step_api_2d.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_step", "bellande_step_api_2d.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -34,7 +34,7 @@ def ros2_launch_description(): x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_step', + package='web_api_bellande_step', executable='bellande_step_api_2d.py', name='bellande_step_api_2d_node', output='screen', diff --git a/ros_web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch b/web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch similarity index 93% rename from ros_web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch rename to web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch index 15edced..0c42faf 100644 --- a/ros_web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch +++ b/web_api_bellande_motion_probabilistic/launch/ros1/bellande_motion_probabilistic.launch @@ -21,7 +21,7 @@ the License. - diff --git a/web_api_bellande_motion_probabilistic/package.xml b/web_api_bellande_motion_probabilistic/package.xml new file mode 100644 index 0000000..3fa4797 --- /dev/null +++ b/web_api_bellande_motion_probabilistic/package.xml @@ -0,0 +1,53 @@ + + + + web_api_bellande_motion_probabilistic + 0.0.1 + Bellande ROS/ROS2 package with a JSON config file for making HTTP requests + Ronaldson Bellande + Ronaldson Bellande + Apache License 2.0 + + + catkin + + roscpp + rospy + + roscpp + rospy + + roscpp + rospy + + + ament_cmake + + rclcpp + rclpy + + rclcpp + rclpy + + rclcpp + rclpy + + + + + diff --git a/ros_web_api_bellande_search_path/script/build.sh b/web_api_bellande_motion_probabilistic/script/build.sh similarity index 67% rename from ros_web_api_bellande_search_path/script/build.sh rename to web_api_bellande_motion_probabilistic/script/build.sh index 78e4cf0..c4da481 100644 --- a/ros_web_api_bellande_search_path/script/build.sh +++ b/web_api_bellande_motion_probabilistic/script/build.sh @@ -23,7 +23,7 @@ cd .. # Run ROS launch file if [ $ROS_VERSION -eq 1 ]; then - roslaunch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + roslaunch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 else - ros2 launch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + ros2 launch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 fi diff --git a/ros_web_api_bellande_motion_probabilistic/setup.py b/web_api_bellande_motion_probabilistic/setup.py similarity index 85% rename from ros_web_api_bellande_motion_probabilistic/setup.py rename to web_api_bellande_motion_probabilistic/setup.py index 5ec6985..5752cee 100755 --- a/ros_web_api_bellande_motion_probabilistic/setup.py +++ b/web_api_bellande_motion_probabilistic/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_step_api_2d.py'], - packages=['ros_web_api_bellande_step'], + packages=['web_api_bellande_step'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_motion_probabilistic/src/bellande_motion_probabilistic.py b/web_api_bellande_motion_probabilistic/src/bellande_motion_probabilistic.py similarity index 100% rename from ros_web_api_bellande_motion_probabilistic/src/bellande_motion_probabilistic.py rename to web_api_bellande_motion_probabilistic/src/bellande_motion_probabilistic.py diff --git a/web_api_bellande_probabilistic/CMakeLists.txt b/web_api_bellande_probabilistic/CMakeLists.txt new file mode 100644 index 0000000..60c7df7 --- /dev/null +++ b/web_api_bellande_probabilistic/CMakeLists.txt @@ -0,0 +1,61 @@ +# Copyright (C) 2024 Bellande Robotics Sensors Research Innovation Center, Ronaldson Bellande +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +cmake_minimum_required(VERSION 3.8) +project(web_api_bellande_probabilistic) + +# Find ROS +if($ENV{ROS_VERSION} EQUAL 1) + find_package(catkin REQUIRED COMPONENTS + roscpp + rospy + ) +else() + find_package(ament_cmake REQUIRED COMPONENTS + rclcpp + rclpy + ) +endif() + +if($ENV{ROS_VERSION} EQUAL 1) + catkin_package( + INCLUDE_DIRS + LIBRARIES ${PROJECT_NAME} + CATKIN_DEPENDS + roscpp + rospy + ) +endif() + +# Install Python scripts for both ROS 1 +if($ENV{ROS_VERSION} EQUAL 1) + catkin_install_python( + PROGRAMS + src/bellande_probabilistic_api_2d.py + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} + ) +endif() + +# Install Python scripts, configuration files, and launch files +if($ENV{ROS_VERSION} EQUAL "1") + install(PROGRAMS src/bellande_probabilistic_api_2d.py DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) + install(DIRECTORY config/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config) + install(DIRECTORY launch/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch) +elseif($ENV{ROS_VERSION} EQUAL "2") + install(PROGRAMS src/bellande_probabilistic_api_2d.py DESTINATION lib/${PROJECT_NAME}) + install(DIRECTORY config/ DESTINATION share/${PROJECT_NAME}/config) + install(DIRECTORY launch/ DESTINATION share/${PROJECT_NAME}/launch) + ament_package() +endif() diff --git a/web_api_bellande_probabilistic/README.md b/web_api_bellande_probabilistic/README.md new file mode 100644 index 0000000..3315d1f --- /dev/null +++ b/web_api_bellande_probabilistic/README.md @@ -0,0 +1,10 @@ +# Bellande Web ROS/ROS2 API + +# [Bellande probabilistic](https://github.com/RonaldsonBellande/bellande_robots_probabilistic) + +# ROS1 Launch +- python3 bellande_probabilistic_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 +- roslaunch web_api_bellande_probabilistic bellande_probabilistic_api_2d.launch x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + +# ROS2 Launch +- ros2 launch web_api_bellande_probabilistic bellande_probabilistic_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 diff --git a/web_api_bellande_probabilistic/config/configs.json b/web_api_bellande_probabilistic/config/configs.json new file mode 100644 index 0000000..018cb05 --- /dev/null +++ b/web_api_bellande_probabilistic/config/configs.json @@ -0,0 +1,23 @@ +{ + "license": [ + "Copyright (C) 2024 Bellande Robotics Sensors Research Innovation Center, Ronaldson Bellande", + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + "", + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY WARRANTY; without even the implied warranty of", + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", + "GNU General Public License for more details.", + "", + "You should have received a copy of the GNU General Public License", + "along with this program. If not, see .", + "GNU General Public License v3.0 or later" + ], + "url": "https://bellande-robotics-sensors-research-innovation-center.org", + "endpoint_path": { + "bellande_probabilistic": "/api/Bellande_Probabilistic/bellande_probabilistic_nd" + }, + "Bellande_Framework_Access_Key": "bellande_web_api_opensource" +} diff --git a/ros_web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc b/web_api_bellande_probabilistic/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc similarity index 81% rename from ros_web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc rename to web_api_bellande_probabilistic/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc index ef81512..e9bedec 100644 Binary files a/ros_web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc and b/web_api_bellande_probabilistic/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc differ diff --git a/web_api_bellande_probabilistic/launch/bellande_probabilistic_api_2d.launch.py b/web_api_bellande_probabilistic/launch/bellande_probabilistic_api_2d.launch.py new file mode 100644 index 0000000..36bb1c1 --- /dev/null +++ b/web_api_bellande_probabilistic/launch/bellande_probabilistic_api_2d.launch.py @@ -0,0 +1,76 @@ +# Copyright (C) 2024 Bellande Robotics Sensors Research Innovation Center, Ronaldson Bellande +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import sys +import subprocess +from launch import LaunchDescription +from launch_ros.actions import Node +from launch.actions import DeclareLaunchArgument +from launch.substitutions import LaunchConfiguration + + +def ros1_launch_description(): + # Get command-line arguments + args = sys.argv[1:] + + # Construct the ROS 1 launch commandi + roslaunch_command = ["roslaunch", "web_api_bellande_probabilistic", "bellande_probabilistic_api_2d.launch"] + args + + # Execute the launch command + subprocess.call(roslaunch_command) + + +def ros2_launch_description(): + # Declare launch arguments + x1_arg = DeclareLaunchArgument('x1') + y1_arg = DeclareLaunchArgument('y1') + x2_arg = DeclareLaunchArgument('x2') + y2_arg = DeclareLaunchArgument('y2') + limit_arg = DeclareLaunchArgument('limit') + + # Create a list to hold all nodes to be launched + nodes_to_launch = [] + + # ROS2 specific configurations + ros_launch_arguments = [ + x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, + ] + nodes_to_launch.append(Node( + package='web_api_bellande_probabilistic', + executable='bellande_probabilistic_api_2d.py', + name='bellande_probabilistic_api_2d_node', + output='screen', + parameters=[ + {'x1': LaunchConfiguration('x1')}, + {'y1': LaunchConfiguration('y1')}, + {'x2': LaunchConfiguration('x2')}, + {'y2': LaunchConfiguration('y2')}, + {'limit': LaunchConfiguration('limit')}, + ], + )) + + # Return the LaunchDescription containing all nodes and arguments + return LaunchDescription(ros_launch_arguments + nodes_to_launch) + +if __name__ == "__main__": + ros_version = os.getenv("ROS_VERSION") + if ros_version == "1": + ros1_launch_description() + elif ros_version == "2": + ros2_launch_description() + else: + print("Unsupported ROS version. Please set the ROS_VERSION environment variable to '1' for ROS 1 or '2' for ROS 2.") + sys.exit(1) diff --git a/web_api_bellande_probabilistic/launch/ros1/bellande_probabilistic_api_2d.launch b/web_api_bellande_probabilistic/launch/ros1/bellande_probabilistic_api_2d.launch new file mode 100644 index 0000000..9fa8aec --- /dev/null +++ b/web_api_bellande_probabilistic/launch/ros1/bellande_probabilistic_api_2d.launch @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + diff --git a/web_api_bellande_probabilistic/package.xml b/web_api_bellande_probabilistic/package.xml new file mode 100644 index 0000000..4088521 --- /dev/null +++ b/web_api_bellande_probabilistic/package.xml @@ -0,0 +1,53 @@ + + + + web_api_bellande_probabilistic + 0.0.1 + Bellande ROS/ROS2 package with a JSON config file for making HTTP requests + Ronaldson Bellande + Ronaldson Bellande + GNU General Public License v3.0 + + + catkin + + roscpp + rospy + + roscpp + rospy + + roscpp + rospy + + + ament_cmake + + rclcpp + rclpy + + rclcpp + rclpy + + rclcpp + rclpy + + + + + diff --git a/web_api_bellande_probabilistic/setup.py b/web_api_bellande_probabilistic/setup.py new file mode 100755 index 0000000..5b08fed --- /dev/null +++ b/web_api_bellande_probabilistic/setup.py @@ -0,0 +1,11 @@ +from distutils.core import setup +from catkin_pkg.python_setup import generate_distutils_setup + +# fetch values from package.xml +setup_args = generate_distutils_setup( + scripts=['src/bellande_probabilistic_api_2d.py'], + packages=['web_api_bellande_probabilistic'], + package_dir={'': 'src'}, +) + +setup(**setup_args) diff --git a/ros_web_api_bellande_step/src/bellande_step_api_2d.py b/web_api_bellande_probabilistic/src/bellande_probabilistic_api_2d.py similarity index 100% rename from ros_web_api_bellande_step/src/bellande_step_api_2d.py rename to web_api_bellande_probabilistic/src/bellande_probabilistic_api_2d.py diff --git a/ros_web_api_bellande_search_path/CMakeLists.txt b/web_api_bellande_search_path/CMakeLists.txt similarity index 97% rename from ros_web_api_bellande_search_path/CMakeLists.txt rename to web_api_bellande_search_path/CMakeLists.txt index 2391d0b..ccdfdda 100644 --- a/ros_web_api_bellande_search_path/CMakeLists.txt +++ b/web_api_bellande_search_path/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_search_path) +project(web_api_bellande_search_path) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_search_path/README.md b/web_api_bellande_search_path/README.md similarity index 100% rename from ros_web_api_bellande_search_path/README.md rename to web_api_bellande_search_path/README.md diff --git a/ros_web_api_bellande_search_path/config/configs.json b/web_api_bellande_search_path/config/configs.json similarity index 100% rename from ros_web_api_bellande_search_path/config/configs.json rename to web_api_bellande_search_path/config/configs.json diff --git a/ros_web_api_bellande_search_path/launch/bellande_search_path.launch.py b/web_api_bellande_search_path/launch/bellande_search_path.launch.py similarity index 92% rename from ros_web_api_bellande_search_path/launch/bellande_search_path.launch.py rename to web_api_bellande_search_path/launch/bellande_search_path.launch.py index be7af43..2fa5e1b 100644 --- a/ros_web_api_bellande_search_path/launch/bellande_search_path.launch.py +++ b/web_api_bellande_search_path/launch/bellande_search_path.launch.py @@ -12,7 +12,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_step", "bellande_step_api_2d.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_step", "bellande_step_api_2d.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -34,7 +34,7 @@ def ros2_launch_description(): x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_step', + package='web_api_bellande_step', executable='bellande_step_api_2d.py', name='bellande_step_api_2d_node', output='screen', diff --git a/ros_web_api_bellande_search_path/launch/ros1/bellande_search_path.launch b/web_api_bellande_search_path/launch/ros1/bellande_search_path.launch similarity index 93% rename from ros_web_api_bellande_search_path/launch/ros1/bellande_search_path.launch rename to web_api_bellande_search_path/launch/ros1/bellande_search_path.launch index 15edced..0c42faf 100644 --- a/ros_web_api_bellande_search_path/launch/ros1/bellande_search_path.launch +++ b/web_api_bellande_search_path/launch/ros1/bellande_search_path.launch @@ -21,7 +21,7 @@ the License. - diff --git a/ros_web_api_bellande_search_path/package.xml b/web_api_bellande_search_path/package.xml similarity index 97% rename from ros_web_api_bellande_search_path/package.xml rename to web_api_bellande_search_path/package.xml index 085289e..0298fef 100644 --- a/ros_web_api_bellande_search_path/package.xml +++ b/web_api_bellande_search_path/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_search_path + web_api_bellande_search_path 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/ros_web_api_bellande_extremum_optimization/script/build.sh b/web_api_bellande_search_path/script/build.sh similarity index 67% rename from ros_web_api_bellande_extremum_optimization/script/build.sh rename to web_api_bellande_search_path/script/build.sh index 78e4cf0..c4da481 100644 --- a/ros_web_api_bellande_extremum_optimization/script/build.sh +++ b/web_api_bellande_search_path/script/build.sh @@ -23,7 +23,7 @@ cd .. # Run ROS launch file if [ $ROS_VERSION -eq 1 ]; then - roslaunch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + roslaunch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 else - ros2 launch ros_web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 + ros2 launch web_api_bellande_step bellande_step_api_2d_launch.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 fi diff --git a/ros_web_api_bellande_extremum_optimization/setup.py b/web_api_bellande_search_path/setup.py similarity index 85% rename from ros_web_api_bellande_extremum_optimization/setup.py rename to web_api_bellande_search_path/setup.py index 5ec6985..5752cee 100755 --- a/ros_web_api_bellande_extremum_optimization/setup.py +++ b/web_api_bellande_search_path/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_step_api_2d.py'], - packages=['ros_web_api_bellande_step'], + packages=['web_api_bellande_step'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_search_path/src/bellande_search_path.py b/web_api_bellande_search_path/src/bellande_search_path.py similarity index 100% rename from ros_web_api_bellande_search_path/src/bellande_search_path.py rename to web_api_bellande_search_path/src/bellande_search_path.py diff --git a/ros_web_api_bellande_speech_detection/CMakeLists.txt b/web_api_bellande_speech_detection/CMakeLists.txt similarity index 97% rename from ros_web_api_bellande_speech_detection/CMakeLists.txt rename to web_api_bellande_speech_detection/CMakeLists.txt index 7b186fe..aefff83 100644 --- a/ros_web_api_bellande_speech_detection/CMakeLists.txt +++ b/web_api_bellande_speech_detection/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_speech_detection) +project(web_api_bellande_speech_detection) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_speech_detection/README.md b/web_api_bellande_speech_detection/README.md similarity index 100% rename from ros_web_api_bellande_speech_detection/README.md rename to web_api_bellande_speech_detection/README.md diff --git a/ros_web_api_bellande_speech_detection/config/configs.json b/web_api_bellande_speech_detection/config/configs.json similarity index 100% rename from ros_web_api_bellande_speech_detection/config/configs.json rename to web_api_bellande_speech_detection/config/configs.json diff --git a/ros_web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py b/web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py similarity index 93% rename from ros_web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py rename to web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py index 2b5d079..a1cd89b 100644 --- a/ros_web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py +++ b/web_api_bellande_speech_detection/launch/bellande_speech_detection.launch.py @@ -26,7 +26,7 @@ def ros1_launch_description(): # Get command-line arguments args = sys.argv[1:] # Construct the ROS 1 launch command - roslaunch_command = ["roslaunch", "ros_web_api_bellande_speech_detection", "bellande_speech_detection.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_speech_detection", "bellande_speech_detection.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -46,7 +46,7 @@ def ros2_launch_description(): ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_speech_detection', + package='web_api_bellande_speech_detection', executable='bellande_speech_detection.py', name='bellande_speech_detection_node', output='screen', diff --git a/ros_web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch b/web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch similarity index 92% rename from ros_web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch rename to web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch index 7c0eea3..5d337cd 100644 --- a/ros_web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch +++ b/web_api_bellande_speech_detection/launch/ros1/bellande_speech_detection.launch @@ -21,7 +21,7 @@ the License. - diff --git a/web_api_bellande_speech_detection/package.xml b/web_api_bellande_speech_detection/package.xml new file mode 100644 index 0000000..4751d4f --- /dev/null +++ b/web_api_bellande_speech_detection/package.xml @@ -0,0 +1,53 @@ + + + + web_api_bellande_speech_detection + 0.0.1 + Bellande ROS/ROS2 package with a JSON config file for making HTTP requests + Ronaldson Bellande + Ronaldson Bellande + Apache License 2.0 + + + catkin + + roscpp + rospy + + roscpp + rospy + + roscpp + rospy + + + ament_cmake + + rclcpp + rclpy + + rclcpp + rclpy + + rclcpp + rclpy + + + + + diff --git a/ros_web_api_bellande_speech_detection/setup.py b/web_api_bellande_speech_detection/setup.py similarity index 82% rename from ros_web_api_bellande_speech_detection/setup.py rename to web_api_bellande_speech_detection/setup.py index 283e16c..a9f758b 100755 --- a/ros_web_api_bellande_speech_detection/setup.py +++ b/web_api_bellande_speech_detection/setup.py @@ -4,7 +4,7 @@ from catkin_pkg.python_setup import generate_distutils_setup # fetch values from package.xml setup_args = generate_distutils_setup( scripts=['src/bellande_speech_detection.py'], - packages=['ros_web_api_bellande_speech_detection'], + packages=['web_api_bellande_speech_detection'], package_dir={'': 'src'}, ) diff --git a/ros_web_api_bellande_speech_detection/src/bellande_speech_detection.py b/web_api_bellande_speech_detection/src/bellande_speech_detection.py similarity index 100% rename from ros_web_api_bellande_speech_detection/src/bellande_speech_detection.py rename to web_api_bellande_speech_detection/src/bellande_speech_detection.py diff --git a/ros_web_api_bellande_step/CMakeLists.txt b/web_api_bellande_step/CMakeLists.txt similarity index 98% rename from ros_web_api_bellande_step/CMakeLists.txt rename to web_api_bellande_step/CMakeLists.txt index e7e737c..ddc8c61 100644 --- a/ros_web_api_bellande_step/CMakeLists.txt +++ b/web_api_bellande_step/CMakeLists.txt @@ -14,7 +14,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.8) -project(ros_web_api_bellande_step) +project(web_api_bellande_step) # Find ROS if($ENV{ROS_VERSION} EQUAL 1) diff --git a/ros_web_api_bellande_ai_system/README.md b/web_api_bellande_step/README.md similarity index 50% rename from ros_web_api_bellande_ai_system/README.md rename to web_api_bellande_step/README.md index c6e3257..64ba614 100644 --- a/ros_web_api_bellande_ai_system/README.md +++ b/web_api_bellande_step/README.md @@ -4,7 +4,7 @@ # ROS1 Launch - python3 bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 -- roslaunch ros_web_api_bellande_step bellande_step_api_2d.launch x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 +- roslaunch web_api_bellande_step bellande_step_api_2d.launch x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 # ROS2 Launch -- ros2 launch ros_web_api_bellande_step bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 +- ros2 launch web_api_bellande_step bellande_step_api_2d.launch.py x1:=0 y1:=0 x2:=5 y2:=5 limit:=3 diff --git a/ros_web_api_bellande_step/configs/bellande/http_configs.bellande b/web_api_bellande_step/configs/bellande/http_configs.bellande similarity index 100% rename from ros_web_api_bellande_step/configs/bellande/http_configs.bellande rename to web_api_bellande_step/configs/bellande/http_configs.bellande diff --git a/ros_web_api_bellande_step/configs/bellande/tcp_configs.bellande b/web_api_bellande_step/configs/bellande/tcp_configs.bellande similarity index 100% rename from ros_web_api_bellande_step/configs/bellande/tcp_configs.bellande rename to web_api_bellande_step/configs/bellande/tcp_configs.bellande diff --git a/ros_web_api_bellande_step/configs/bellande/tls_configs.bellande b/web_api_bellande_step/configs/bellande/tls_configs.bellande similarity index 100% rename from ros_web_api_bellande_step/configs/bellande/tls_configs.bellande rename to web_api_bellande_step/configs/bellande/tls_configs.bellande diff --git a/ros_web_api_bellande_step/configs/json/http_configs.json b/web_api_bellande_step/configs/json/http_configs.json similarity index 100% rename from ros_web_api_bellande_step/configs/json/http_configs.json rename to web_api_bellande_step/configs/json/http_configs.json diff --git a/ros_web_api_bellande_step/configs/json/tcp_configs.json b/web_api_bellande_step/configs/json/tcp_configs.json similarity index 100% rename from ros_web_api_bellande_step/configs/json/tcp_configs.json rename to web_api_bellande_step/configs/json/tcp_configs.json diff --git a/ros_web_api_bellande_step/configs/json/tls_configs.json b/web_api_bellande_step/configs/json/tls_configs.json similarity index 100% rename from ros_web_api_bellande_step/configs/json/tls_configs.json rename to web_api_bellande_step/configs/json/tls_configs.json diff --git a/web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc b/web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc new file mode 100644 index 0000000..e9bedec Binary files /dev/null and b/web_api_bellande_step/launch/__pycache__/bellande_step_api_2d_launch.cpython-38.pyc differ diff --git a/ros_web_api_bellande_step/launch/bellande_step_api_2d.launch.py b/web_api_bellande_step/launch/bellande_step_api_2d.launch.py similarity index 94% rename from ros_web_api_bellande_step/launch/bellande_step_api_2d.launch.py rename to web_api_bellande_step/launch/bellande_step_api_2d.launch.py index 4e5411d..b0606dc 100644 --- a/ros_web_api_bellande_step/launch/bellande_step_api_2d.launch.py +++ b/web_api_bellande_step/launch/bellande_step_api_2d.launch.py @@ -27,7 +27,7 @@ def ros1_launch_description(): args = sys.argv[1:] # Construct the ROS 1 launch commandi - roslaunch_command = ["roslaunch", "ros_web_api_bellande_step", "bellande_step_api_2d.launch"] + args + roslaunch_command = ["roslaunch", "web_api_bellande_step", "bellande_step_api_2d.launch"] + args # Execute the launch command subprocess.call(roslaunch_command) @@ -49,7 +49,7 @@ def ros2_launch_description(): x1_arg, y1_arg, x2_arg, y2_arg, limit_arg, ] nodes_to_launch.append(Node( - package='ros_web_api_bellande_step', + package='web_api_bellande_step', executable='bellande_step_api_2d.py', name='bellande_step_api_2d_node', output='screen', diff --git a/ros_web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch b/web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch similarity index 94% rename from ros_web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch rename to web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch index bcd5dab..414895b 100644 --- a/ros_web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch +++ b/web_api_bellande_step/launch/ros1/bellande_step_api_2d.launch @@ -22,7 +22,7 @@ along with this program. If not, see . - diff --git a/ros_web_api_bellande_step/package.xml b/web_api_bellande_step/package.xml similarity index 98% rename from ros_web_api_bellande_step/package.xml rename to web_api_bellande_step/package.xml index 1077700..0935765 100644 --- a/ros_web_api_bellande_step/package.xml +++ b/web_api_bellande_step/package.xml @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - ros_web_api_bellande_step + web_api_bellande_step 0.0.1 Bellande ROS/ROS2 package with a JSON config file for making HTTP requests Ronaldson Bellande diff --git a/web_api_bellande_step/setup.py b/web_api_bellande_step/setup.py new file mode 100755 index 0000000..5752cee --- /dev/null +++ b/web_api_bellande_step/setup.py @@ -0,0 +1,11 @@ +from distutils.core import setup +from catkin_pkg.python_setup import generate_distutils_setup + +# fetch values from package.xml +setup_args = generate_distutils_setup( + scripts=['src/bellande_step_api_2d.py'], + packages=['web_api_bellande_step'], + package_dir={'': 'src'}, +) + +setup(**setup_args) diff --git a/web_api_bellande_step/src/bellande_step_api_2d.py b/web_api_bellande_step/src/bellande_step_api_2d.py new file mode 100755 index 0000000..16de6d2 --- /dev/null +++ b/web_api_bellande_step/src/bellande_step_api_2d.py @@ -0,0 +1,106 @@ +# Copyright (C) 2024 Bellande Robotics Sensors Research Innovation Center, Ronaldson Bellande +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import json +import os +import requests +from std_msgs.msg import String + +def get_next_step(x1, y1, x2, y2, limit): + payload = { + "node0": {"x": x1, "y": y1}, + "node1": {"x": x2, "y": y2} + } + + headers = { + 'accept': 'application/json', + 'Content-Type': 'application/json', + "Authorization": f"Bearer {api_access_key}" + } + + try: + response = requests.post( + f"{api_url}?limit={limit}", + json=payload, + headers=headers + ) + response.raise_for_status() + data = response.json() + return String(f"Next Step: {data['next_step']}") + except requests.exceptions.RequestException as e: + print(f"Error: {e}") + return None + +def parameter_callback(event): + x1 = rospy.get_param('x1', 0) + y1 = rospy.get_param('y1', 0) + x2 = rospy.get_param('x2', 0) + y2 = rospy.get_param('y2', 0) + limit = rospy.get_param('limit', 3) + + next_step = get_next_step(x1, y1, x2, y2, limit) + if next_step: + pub.publish(next_step) + +def main(): + global api_url, api_access_key, pub + + config_file_path = os.path.join(os.path.dirname(__file__), '../config/configs.json') + + if not os.path.exists(config_file_path): + print("Config file not found:", config_file_path) + return + + with open(config_file_path, 'r') as config_file: + config = json.load(config_file) + url = config['url'] + endpoint_path = config['endpoint_path']["2d"] + api_access_key = config["Bellande_Framework_Access_Key"] + + # Initialize ROS node + if ros_version == "1": + rospy.init_node('next_step_node', anonymous=True) + pub = rospy.Publisher('next_step_result', String, queue_size=10) + rospy.Timer(rospy.Duration(1), parameter_callback) # Check parameters every second + elif ros_version == "2": + rclpy.init() + node = rclpy.create_node('next_step_node') + pub = node.create_publisher(String, 'next_step_result', 10) + node.create_timer(1.0, parameter_callback) # Check parameters every second + + api_url = f"{url}{endpoint_path}" + + try: + print("Next step node is running. Ctrl+C to exit.") + if ros_version == "1": + rospy.spin() + elif ros_version == "2": + rclpy.spin(node) + except KeyboardInterrupt: + print("Shutting down next step node.") + except Exception as e: + print(f"An error occurred: {str(e)}") + finally: + if ros_version == "2": + node.destroy_node() + rclpy.shutdown() + +if __name__ == '__main__': + ros_version = os.getenv("ROS_VERSION") + if ros_version == "1": + import rospy + elif ros_version == "2": + import rclpy + main()