diff --git a/src/ezbot_descr_simul/launch/launch_sim.launch.py b/src/ezbot_descr_simul/launch/launch_sim.launch.py index 017a5ff..299212c 100644 --- a/src/ezbot_descr_simul/launch/launch_sim.launch.py +++ b/src/ezbot_descr_simul/launch/launch_sim.launch.py @@ -29,6 +29,11 @@ def generate_launch_description(): )]), launch_arguments={'use_sim_time': 'true'}.items() ) + rsp2 = IncludeLaunchDescription( + PythonLaunchDescriptionSource([os.path.join( + get_package_share_directory('ezbot_static_camera'),'launch','rsp.launch.py' + )]), launch_arguments={'use_sim_time': 'true'}.items() + ) # Include the Gazebo launch file, provided by the gazebo_ros package gazebo = IncludeLaunchDescription( PythonLaunchDescriptionSource([os.path.join( @@ -45,6 +50,15 @@ def generate_launch_description(): '-z', '1.0' ], output='screen') + spawn_entity2 = Node(package='gazebo_ros', executable='spawn_entity.py', + namespace='camera_namespace', + name='Pascameracontroller', + arguments=['-topic', 'robot_description', + '-entity', 'camera', + '-x','1.0', + '-y','-1.0', + '-z', '1.0' ], + output='screen') #joystick = IncludeLaunchDescription( # PythonLaunchDescriptionSource([os.path.join( # get_package_share_directory(package_name),'launch','joystick.launch.py' @@ -59,6 +73,8 @@ def generate_launch_description(): default_value=[os.path.join(get_package_share_directory("ezbot_gazebo"), 'worlds', 'table2024Poteaux.world'), ''], description='SDF world file'), rsp, - gazebo, - spawn_entity + spawn_entity, + rsp2, + spawn_entity2, + gazebo ]) \ No newline at end of file diff --git a/src/ezbot_static_camera/CMakeLists.txt b/src/ezbot_static_camera/CMakeLists.txt new file mode 100644 index 0000000..a0491d9 --- /dev/null +++ b/src/ezbot_static_camera/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.5) +project(ezbot_static_camera) + +# Default to C99 +if(NOT CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 99) +endif() + +# Default to C++14 +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-Wall -Wextra -Wpedantic) +endif() + +# find dependencies +find_package(ament_cmake REQUIRED) +# uncomment the following section in order to fill in +# further dependencies manually. +# find_package( REQUIRED) + +if(BUILD_TESTING) + find_package(ament_lint_auto REQUIRED) + # the following line skips the linter which checks for copyrights + # uncomment the line when a copyright and license is not present in all source files + #set(ament_cmake_copyright_FOUND TRUE) + # the following line skips cpplint (only works in a git repo) + # uncomment the line when this package is not in a git repo + #set(ament_cmake_cpplint_FOUND TRUE) + ament_lint_auto_find_test_dependencies() +endif() + +install( + DIRECTORY description launch worlds + DESTINATION share/${PROJECT_NAME} +) + +ament_package() diff --git a/src/ezbot_static_camera/LICENSE.md b/src/ezbot_static_camera/LICENSE.md new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/src/ezbot_static_camera/LICENSE.md @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/ezbot_static_camera/README.md b/src/ezbot_static_camera/README.md new file mode 100644 index 0000000..d2f2f88 --- /dev/null +++ b/src/ezbot_static_camera/README.md @@ -0,0 +1,7 @@ +## Robot Package Template + +This is a GitHub template. You can make your own copy by clicking the green "Use this template" button. + +It is recommended that you keep the repo/package name the same, but if you do change it, ensure you do a "Find all" using your IDE (or the built-in GitHub IDE by hitting the `.` key) and rename all instances of `my_bot` to whatever your project's name is. + +Note that each directory currently has at least one file in it to ensure that git tracks the files (and, consequently, that a fresh clone has direcctories present for CMake to find). These example files can be removed if required (and the directories can be removed if `CMakeLists.txt` is adjusted accordingly). \ No newline at end of file diff --git a/src/ezbot_static_camera/description/camera_static.xacro b/src/ezbot_static_camera/description/camera_static.xacro new file mode 100644 index 0000000..4422ff4 --- /dev/null +++ b/src/ezbot_static_camera/description/camera_static.xacro @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + true + false + + + + + Gazebo/Black + false + + 0 0 0 0 0 0 + true + 10 + + 1.089 + + R8G8B8 + 1280 + 1280 + + + 0.05 + 8.0 + + + + + camera_namespace + + camera_link_optical + + + + + \ No newline at end of file diff --git a/src/ezbot_static_camera/description/inertial_macros.xacro b/src/ezbot_static_camera/description/inertial_macros.xacro new file mode 100644 index 0000000..5cf1cac --- /dev/null +++ b/src/ezbot_static_camera/description/inertial_macros.xacro @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ezbot_static_camera/description/robot.urdf.xacro b/src/ezbot_static_camera/description/robot.urdf.xacro new file mode 100644 index 0000000..99a7056 --- /dev/null +++ b/src/ezbot_static_camera/description/robot.urdf.xacro @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/ezbot_static_camera/description/robot_core.xacro b/src/ezbot_static_camera/description/robot_core.xacro new file mode 100644 index 0000000..e02d9a9 --- /dev/null +++ b/src/ezbot_static_camera/description/robot_core.xacro @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + Gazebo/Orange + + + + + diff --git a/src/ezbot_static_camera/launch/__pycache__/launch_sim.launch.cpython-310.pyc b/src/ezbot_static_camera/launch/__pycache__/launch_sim.launch.cpython-310.pyc new file mode 100644 index 0000000..4ad8f73 Binary files /dev/null and b/src/ezbot_static_camera/launch/__pycache__/launch_sim.launch.cpython-310.pyc differ diff --git a/src/ezbot_static_camera/launch/joystick.launch.py b/src/ezbot_static_camera/launch/joystick.launch.py new file mode 100644 index 0000000..66e33e0 --- /dev/null +++ b/src/ezbot_static_camera/launch/joystick.launch.py @@ -0,0 +1,45 @@ + +from launch import LaunchDescription +from launch_ros.actions import Node +from launch.substitutions import LaunchConfiguration +from launch.actions import DeclareLaunchArgument + +import os +from ament_index_python.packages import get_package_share_directory + +def generate_launch_description(): + use_sim_time = LaunchConfiguration('use_sim_time') + + joy_params = os.path.join(get_package_share_directory('ezbot_static_camera'),'config','joystick.yaml') + + joy_node = Node( + package='joy', + executable='joy_node', + parameters=[joy_params, {'use_sim_time': use_sim_time}], + ) + + teleop_node = Node( + package='teleop_twist_joy', + executable='teleop_twist_joy', + name='teleop_twist_joy', + parameters=[joy_params, {'use_sim_time': use_sim_time}] + ) + + # twist_stamper = Node( + # package='twist_stamper', + # executable='twist_stamper', + # parameters=[{'use_sim_time': use_sim_time}], + # remappings=[('/cmd_vel_in','/diff_cont/cmd_vel_unstamped'), + # ('/cmd_vel_out','/diff_cont/cmd_vel')] + # ) + + + return LaunchDescription([ + DeclareLaunchArgument( + 'use_sim_time', + default_value='true', + description='Use sim time if true'), + joy_node, + teleop_node, + # twist_stamper + ]) \ No newline at end of file diff --git a/src/ezbot_static_camera/launch/launch_sim.launch.py b/src/ezbot_static_camera/launch/launch_sim.launch.py new file mode 100644 index 0000000..a577fe9 --- /dev/null +++ b/src/ezbot_static_camera/launch/launch_sim.launch.py @@ -0,0 +1,64 @@ +# copyright option3 ensma +import os + +from ament_index_python.packages import get_package_share_directory + + +from launch import LaunchDescription +from launch.actions import IncludeLaunchDescription +from launch.actions import DeclareLaunchArgument +import launch_ros.actions +from launch.substitutions import LaunchConfiguration +from launch.launch_description_sources import PythonLaunchDescriptionSource + +from launch_ros.actions import Node + + + +def generate_launch_description(): + + + # Include the robot_state_publisher launch file, provided by our own package. Force sim time to be enabled + # !!! MAKE SURE YOU SET THE PACKAGE NAME CORRECTLY !!! + + package_name='ezbot_static_camera' #<--- CHANGE ME + + rsp = IncludeLaunchDescription( + PythonLaunchDescriptionSource([os.path.join( + get_package_share_directory(package_name),'launch','rsp.launch.py' + )]), launch_arguments={'use_sim_time': 'true'}.items() + ) + + # Include the Gazebo launch file, provided by the gazebo_ros package + gazebo = IncludeLaunchDescription( + PythonLaunchDescriptionSource([os.path.join( + get_package_share_directory('gazebo_ros'), 'launch', 'gazebo.launch.py')]), + launch_arguments={'verbose': 'true'}.items() + ) + + # Run the spawner node from the gazebo_ros package. The entity name doesn't really matter if you only have a single robot. + spawn_entity = Node(package='gazebo_ros', executable='spawn_entity.py', + arguments=['-topic', 'robot_description', + '-entity', 'EzBot', + '-x','1.0', + '-y','-1.0', + '-z', '1.0' ], + output='screen') + + #joystick = IncludeLaunchDescription( + # PythonLaunchDescriptionSource([os.path.join( + # get_package_share_directory(package_name),'launch','joystick.launch.py' + # )]), launch_arguments={'use_sim_time': 'true'}.items()) + + + # Launch them all! + return LaunchDescription([ + DeclareLaunchArgument( + 'world', + #default_value=[os.path.join('ezbot_gazebo','worlds','table2024.world'), ''], + default_value=[os.path.join(get_package_share_directory("ezbot_gazebo"), 'worlds', 'table2024Poteaux.world'), ''], + description='SDF world file'), + rsp, + gazebo, + spawn_entity + ]) \ No newline at end of file diff --git a/src/ezbot_static_camera/launch/rsp.launch.py b/src/ezbot_static_camera/launch/rsp.launch.py new file mode 100644 index 0000000..cf11c04 --- /dev/null +++ b/src/ezbot_static_camera/launch/rsp.launch.py @@ -0,0 +1,44 @@ +# Copyright 2023 Vincent Belpois +import os + +from ament_index_python.packages import get_package_share_directory + +from launch import LaunchDescription +from launch.substitutions import LaunchConfiguration +from launch.actions import DeclareLaunchArgument +from launch_ros.actions import Node + +import xacro + + +def generate_launch_description(): + + # Check if we're told to use sim time + use_sim_time = LaunchConfiguration('use_sim_time') + + # Process the URDF file + pkg_path = os.path.join(get_package_share_directory('ezbot_static_camera')) + xacro_file = os.path.join(pkg_path,'description','robot.urdf.xacro') + robot_description_config = xacro.process_file(xacro_file) + + # Create a robot_state_publisher node + params = {'robot_description': robot_description_config.toxml(), 'use_sim_time': use_sim_time} + node_robot_state_publisher = Node( + package='robot_state_publisher', + executable='robot_state_publisher', + name='Pascameracontroller', + namespace='camera_namespace', + output='screen', + parameters=[params] + ) + + + # Launch! + return LaunchDescription([ + DeclareLaunchArgument( + 'use_sim_time', + default_value='false', + description='Use sim time if true'), + + node_robot_state_publisher + ]) diff --git a/src/ezbot_static_camera/package.xml b/src/ezbot_static_camera/package.xml new file mode 100644 index 0000000..f377848 --- /dev/null +++ b/src/ezbot_static_camera/package.xml @@ -0,0 +1,18 @@ + + + + ezbot_static_camera + 0.0.0 + TODO: Package description + MY NAME + TODO: License declaration + + ament_cmake + + ament_lint_auto + ament_lint_common + + + ament_cmake + + diff --git a/src/ezbot_static_camera/worlds/empty.world b/src/ezbot_static_camera/worlds/empty.world new file mode 100644 index 0000000..5321672 --- /dev/null +++ b/src/ezbot_static_camera/worlds/empty.world @@ -0,0 +1,13 @@ + + + + + + model://sun + + + + model://ground_plane + + +