Skip to content

Commit

Permalink
Renames andino_gazebo package to andino_gz_classic. (Ekumen-OS#153)
Browse files Browse the repository at this point in the history
Signed-off-by: Franco Cipollone <[email protected]>
  • Loading branch information
francocipollone authored Sep 27, 2023
1 parent a090673 commit 5f1b91e
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
- uses: ros-tooling/[email protected]
id: action_ros_ci_step
with:
package-name: andino_base andino_bringup andino_control andino_description andino_firmware andino_hardware andino_slam andino_gazebo andino_navigation
package-name: andino_base andino_bringup andino_control andino_description andino_firmware andino_hardware andino_slam andino_gz_classic andino_navigation
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _Note: For videos go to [Media](#media) section._
- :hammer_and_pick: [`andino_firmware`](./andino_firmware): Contains the code be run in the microcontroller for interfacing low level hardware with the SBC.
- :gear: [`andino_base`](./andino_base): [ROS Control hardware interface](https://control.ros.org/master/doc/ros2_control/hardware_interface/doc/writing_new_hardware_interface.html) is implemented.
- :control_knobs: [`andino_control`](./andino_control/): It launches the [`controller_manager`](https://control.ros.org/humble/doc/ros2_control/controller_manager/doc/userdoc.html) along with the [ros2 controllers](https://control.ros.org/master/doc/ros2_controllers/doc/controllers_index.html): [diff_drive_controller](https://control.ros.org/master/doc/ros2_controllers/diff_drive_controller/doc/userdoc.html) and the [joint_state_broadcaster](https://control.ros.org/master/doc/ros2_controllers/joint_state_broadcaster/doc/userdoc.html).
- :computer: [`andino_gazebo`](./andino_gazebo/): Gazebo simulation of the `andino` robot.
- :computer: [`andino_gz_classic`](./andino_gz_classic/): Gazebo simulation of the `andino` robot.
- :world_map: [`andino_slam`](./andino_slam/): Provides support for SLAM with your `andino` robot.
- :compass: [`andino_navigation`](./andino_navigation/): Navigation stack based on `nav2`.

Expand Down Expand Up @@ -139,9 +139,9 @@ For starting `rviz2` visualization with a provided configuration.

## :computer: Simulation

The [`andino_gazebo`](./andino_gazebo/README.MD) package provides a Gazebo simulation fo the Andino robot.
The [`andino_gz_classic`](./andino_gz_classic/README.MD) package provides a Gazebo simulation fo the Andino robot.

<img src="./andino_gazebo/docs/andino_gazebo.png" width=400/>
<img src="./andino_gz_classic/docs/andino_gz_classic.png" width=400/>

## :compass: Navigation

Expand Down
9 changes: 0 additions & 9 deletions andino_gazebo/CHANGELOG.rst

This file was deleted.

Binary file removed andino_gazebo/docs/andino_gazebo.png
Binary file not shown.
9 changes: 9 additions & 0 deletions andino_gz_classic/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package andino_gz_classic
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


0.0.1 (2023-06-29)
------------------
* First andino release
* Contributors: olmerg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8)

project(andino_gazebo)
project(andino_gz_classic)

# Skip if Gazebo not present
find_package(gazebo QUIET)
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions andino_gazebo/README.MD → andino_gz_classic/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Gazebo Classic simulation for the Andino robot

<img src="docs/andino_gazebo.png">
<img src="docs/andino_gz_classic.png">

## Build

Expand Down Expand Up @@ -38,7 +38,7 @@ This package has the next option to be executed.


```
ros2 launch andino_gazebo andino_one_robot.launch.py initial_pose_x:=3.0
ros2 launch andino_gz_classic andino_one_robot.launch.py initial_pose_x:=3.0
```

This launch file supports the following launch arguments:
Expand All @@ -50,12 +50,12 @@ This launch file supports the following launch arguments:
Finally, all the parameters of spawn an andino robot to put the robot in specific position are available. for more information of all the parameters of the child launch files you can write:

```
ros2 launch andino_gazebo andino_one_robot.launch.py -s
ros2 launch andino_gz_classic andino_one_robot.launch.py -s
```
## Andino simulation with Gazebo ros2 control plugin

```
ros2 launch andino_gazebo andino_one_robot.launch.py use_gazebo_ros_control:=true
ros2 launch andino_gz_classic andino_one_robot.launch.py use_gazebo_ros_control:=true
```

### Considerations
Expand All @@ -65,7 +65,7 @@ ros2 launch andino_gazebo andino_one_robot.launch.py use_gazebo_ros_control:=tru
## Spawn an Andino robot

```
ros2 launch andino_gazebo spawn_robot.launch.py initial_pose_x:=3.0 entity:=andino robot_description_topic:=/andino/robot_description
ros2 launch andino_gz_classic spawn_robot.launch.py initial_pose_x:=3.0 entity:=andino robot_description_topic:=/andino/robot_description
```

The parameters of this launch let to put the robot in any place of the simulation.
Expand Down
Binary file added andino_gz_classic/docs/andino_gz_classic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def generate_launch_description():
rviz_config_file = LaunchConfiguration('rviz_config_file')

pkg_gazebo_ros = get_package_share_directory('gazebo_ros')
pkg_andino_gazebo = get_package_share_directory('andino_gazebo')
pkg_andino_gz_classic = get_package_share_directory('andino_gz_classic')

use_sim_time_argument = DeclareLaunchArgument(
'use_sim_time',
Expand All @@ -68,14 +68,14 @@ def generate_launch_description():
declare_rviz_config_file_cmd = DeclareLaunchArgument(
'rviz_config_file',
default_value=os.path.join(
pkg_andino_gazebo, 'rviz', 'andino_gazebo.rviz'),
pkg_andino_gz_classic, 'rviz', 'andino_gz_classic.rviz'),
description='Full path to the RVIZ config file to use',
)

# Include andino
include_andino = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
os.path.join(pkg_andino_gazebo, 'launch', 'spawn_robot.launch.py')
os.path.join(pkg_andino_gz_classic, 'launch', 'spawn_robot.launch.py')
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def get_robot_description(use_ros_control: str) -> str:
"""
doc = process_file(
os.path.join(
get_package_share_directory('andino_gazebo'), 'urdf', 'andino.gazebo.xacro'
get_package_share_directory('andino_gz_classic'), 'urdf', 'andino_gz_classic.xacro'
),
mappings={
'use_gazebo_ros_control': use_ros_control,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>andino_gazebo</name>
<name>andino_gz_classic</name>
<version>0.0.1</version>
<description>
Launch Gazebo simulation with Andino
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,6 @@
</sensor>
</gazebo>

<xacro:include filename="$(find andino_gazebo)/urdf/include/andino_materials.xacro"/>
<xacro:include filename="$(find andino_gz_classic)/urdf/include/andino_materials.xacro"/>

</robot>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def generate_launch_description():
# Get the launch directory
nav2_bringup_dir = get_package_share_directory('nav2_bringup')
andino_navigation_dir = get_package_share_directory('andino_navigation')
andino_gazebo_dir = get_package_share_directory('andino_gazebo')
andino_gz_classic_dir = get_package_share_directory('andino_gz_classic')

# Create the launch configuration variables
use_sim_time = LaunchConfiguration('use_sim_time')
Expand All @@ -65,7 +65,7 @@ def generate_launch_description():
# Include andino simulation
include_andino = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
os.path.join(andino_gazebo_dir, 'launch', 'andino_one_robot.launch.py')
os.path.join(andino_gz_classic_dir, 'launch', 'andino_one_robot.launch.py')
),
launch_arguments={
'use_gazebo_ros_control': LaunchConfiguration(
Expand Down
2 changes: 1 addition & 1 deletion andino_navigation/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<build_depend>launch_ros</build_depend>

<exec_depend>andino_gazebo</exec_depend>
<exec_depend>andino_gz_classic</exec_depend>
<exec_depend>launch_ros</exec_depend>
<exec_depend>navigation2</exec_depend>
<exec_depend>nav2_bringup</exec_depend>
Expand Down

0 comments on commit 5f1b91e

Please sign in to comment.