Skip to content

Commit

Permalink
action-tutorials-interfaces replaced with example-interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
mgonzs13 committed Dec 1, 2024
1 parent f1e5c22 commit 97b8633
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN source /opt/ros/${ROS_DISTRO}/setup.bash
RUN apt-get update
RUN rosdep update && rosdep install --from-paths src --ignore-src -r -y
RUN if [ "$ROS_DISTRO" = "foxy" ] || [ "$ROS_DISTRO" = "galactic" ] || [ "$ROS_DISTRO" = "rolling" ]; then \
apt install -y ros-$ROS_DISTRO-action-tutorials-interfaces ros-$ROS_DISTRO-example-interfaces; \
apt install -y ros-$ROS_DISTRO-example-interfaces; \
fi

# colcon the ws
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ $ cd ~/ros2_ws
$ colcon build
```

If you are using a deprecated ROS 2 distro (like Foxy or Galactic) or the Rolling distro, you have to install the tutorials and example interfaces:
If you are using a deprecated ROS 2 distro (like Foxy or Galactic) or the Rolling distro, you may need to install the example interfaces:

```shell
$ sudo apt install -y ros-$ROS_DISTRO-action-tutorials-interfaces ros-$ROS_DISTRO-example-interfaces
$ sudo apt install -y ros-$ROS_DISTRO-example-interfaces
```

## Docker
Expand Down Expand Up @@ -337,7 +337,7 @@ $ ros2 run yasmin_demos action_client_demo.py

```python
import rclpy
from action_tutorials_interfaces.action import Fibonacci
from example_interfaces.action import Fibonacci

import yasmin
from yasmin import CbState
Expand Down Expand Up @@ -971,7 +971,7 @@ $ ros2 run yasmin_demos action_client_demo
#include <memory>
#include <string>

#include "action_tutorials_interfaces/action/fibonacci.hpp"
#include "example_interfaces/action/fibonacci.hpp"

#include "yasmin/cb_state.hpp"
#include "yasmin/logs.hpp"
Expand All @@ -984,7 +984,7 @@ $ ros2 run yasmin_demos action_client_demo

using std::placeholders::_1;
using std::placeholders::_2;
using Fibonacci = action_tutorials_interfaces::action::Fibonacci;
using Fibonacci = example_interfaces::action::Fibonacci;
using namespace yasmin;

std::string
Expand Down Expand Up @@ -1045,7 +1045,7 @@ public:

std::stringstream ss;
ss << "Next number in sequence received: ";
for (auto number : feedback->partial_sequence) {
for (auto number : feedback->sequence) {
ss << number << " ";
}

Expand Down
2 changes: 0 additions & 2 deletions yasmin_demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ find_package(yasmin_ros REQUIRED)
find_package(yasmin_viewer REQUIRED)
find_package(nav_msgs REQUIRED)
find_package(example_interfaces REQUIRED)
find_package(action_tutorials_interfaces REQUIRED)

# C++
include_directories(include)
Expand All @@ -59,7 +58,6 @@ set(DEPENDENCIES
yasmin_viewer
nav_msgs
example_interfaces
action_tutorials_interfaces
)

# demo
Expand Down
1 change: 0 additions & 1 deletion yasmin_demos/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<depend>yasmin_viewer</depend>
<depend>nav_msgs</depend>
<depend>example_interfaces</depend>
<depend>action_tutorials_interfaces</depend>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
Expand Down
6 changes: 3 additions & 3 deletions yasmin_demos/src/action_client_demo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <memory>
#include <string>

#include "action_tutorials_interfaces/action/fibonacci.hpp"
#include "example_interfaces/action/fibonacci.hpp"

#include "yasmin/cb_state.hpp"
#include "yasmin/logs.hpp"
Expand All @@ -30,7 +30,7 @@

using std::placeholders::_1;
using std::placeholders::_2;
using Fibonacci = action_tutorials_interfaces::action::Fibonacci;
using Fibonacci = example_interfaces::action::Fibonacci;
using namespace yasmin;

/**
Expand Down Expand Up @@ -130,7 +130,7 @@ class FibonacciState : public yasmin_ros::ActionState<Fibonacci> {

std::stringstream ss;
ss << "Next number in sequence received: ";
for (auto number : feedback->partial_sequence) {
for (auto number : feedback->sequence) {
ss << number << " ";
}

Expand Down
3 changes: 2 additions & 1 deletion yasmin_demos/yasmin_demos/action_client_demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import rclpy
from action_tutorials_interfaces.action import Fibonacci
from example_interfaces.action import Fibonacci

import yasmin
from yasmin import CbState, Blackboard, StateMachine
from yasmin_ros import ActionState
Expand Down

0 comments on commit 97b8633

Please sign in to comment.