diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..544454f --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,13 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package raspimouse_description +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +1.0.0 (2022-07-12) +------------------ +* LiDARの追加 (`#38 `_) +* Merge master branch (ROS1) into ros2 branch (`#37 `_) +* Update library to rviz2 (`#36 `_) +* Update tread (ROS 2) (`#32 `_) +* Update README for ROS 2 (`#26 `_) +* Support ROS 2 Foxy (`#24 `_) +* Contributors: Daisuke Sato, Shota Aoki, Shuhei Kozasa diff --git a/README.md b/README.md index 46a0b07..91c8990 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,20 @@ source install/setup.bash ## How to Use -Display a Raspberry Pi Mouse robot model on RViz2 with the following comand: +Display a Raspberry Pi Mouse robot model on RViz2 with the following command: ```sh ros2 launch raspimouse_description display.launch.py ``` +You can also display a LiDAR mounted robot model with the following command: + +```sh +ros2 launch raspimouse_description display.launch.py lidar:=rplidar +``` + +The `lidar` option supports `urg`, `lds`, and `rplidar`. + ## LICENSE (C) 2016-2021 RT Corporation @@ -48,3 +56,6 @@ Unless attributed otherwise, everything in this repository is under the MIT lice ### Acknowledgements Special thanks to https://gbiggs.github.io/rosjp_urdf_tutorial_text/index.html + +The file [robotis_lds01.stl](./meshes/stl/robotis_lds01.stl) is released from ROBOTIS and licensed under the [Apache License 2.0](https://github.com/ROBOTIS-GIT/turtlebot3/blob/a3c515b350a752b93ed8de4a009442e80e9d787d/LICENSE). +The original file is released in [turtlebot3_description package](https://github.com/ROBOTIS-GIT/turtlebot3/blob/a3c515b350a752b93ed8de4a009442e80e9d787d/turtlebot3_description/meshes/sensors/lds.stl). \ No newline at end of file diff --git a/launch/display.launch.py b/launch/display.launch.py index 64cc632..ebc3115 100644 --- a/launch/display.launch.py +++ b/launch/display.launch.py @@ -28,7 +28,7 @@ def generate_launch_description(): declare_arg_lidar = DeclareLaunchArgument( 'lidar', default_value='none', - description='Set "none" or "urg".') + description='Set "none", "urg", "lds", or "rplidar".') declare_arg_lidar_frame = DeclareLaunchArgument( 'lidar_frame', default_value='laser', diff --git a/meshes/stl/RasPiMouse_MultiLiDARMount.stl b/meshes/stl/RasPiMouse_MultiLiDARMount.stl new file mode 100644 index 0000000..ea1443b Binary files /dev/null and b/meshes/stl/RasPiMouse_MultiLiDARMount.stl differ diff --git a/meshes/stl/robotis_lds01.stl b/meshes/stl/robotis_lds01.stl new file mode 100644 index 0000000..510903e Binary files /dev/null and b/meshes/stl/robotis_lds01.stl differ diff --git a/package.xml b/package.xml index bb81c99..deb7bce 100644 --- a/package.xml +++ b/package.xml @@ -2,11 +2,12 @@ raspimouse_description - 0.1.0 + 1.0.0 The raspimouse_description package RT Corporation Daisuke Sato - Daisuke Sato + Shota Aoki + Shuhei Kozasa MIT diff --git a/urdf/body/option.urdf.xacro b/urdf/body/option.urdf.xacro index 3af3f7b..4d234f2 100644 --- a/urdf/body/option.urdf.xacro +++ b/urdf/body/option.urdf.xacro @@ -14,9 +14,6 @@ - - - @@ -30,4 +27,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/urdf/raspimouse.urdf.xacro b/urdf/raspimouse.urdf.xacro index 5e51807..11229bd 100644 --- a/urdf/raspimouse.urdf.xacro +++ b/urdf/raspimouse.urdf.xacro @@ -13,6 +13,10 @@ + + + + @@ -72,6 +76,23 @@ + + + + + + + + + + + + + + + + + @@ -104,6 +125,14 @@ + + + + + + + + diff --git a/urdf/sensors/lidar.urdf.xacro b/urdf/sensors/lidar.urdf.xacro index 67408ef..ff2a6b9 100644 --- a/urdf/sensors/lidar.urdf.xacro +++ b/urdf/sensors/lidar.urdf.xacro @@ -5,6 +5,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19,19 +50,75 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +