From 6dae76df8a8e39dae840598982e61aeabdef288f Mon Sep 17 00:00:00 2001 From: ynistico Date: Mon, 24 Nov 2025 15:48:04 +0100 Subject: [PATCH] changing namespace from dls2_interfaces to dls2_interface --- .../{dls2_interfaces => dls2_interface}/CMakeLists.txt | 2 +- .../src/{dls2_interfaces => dls2_interface}/LICENSE | 0 .../{dls2_interfaces => dls2_interface}/idl/BaseState.idl | 8 ++++---- .../idl/BlindState.idl | 2 +- .../idl/DlsAnnotation.idl | 0 .../src/{dls2_interfaces => dls2_interface}/idl/Imu.idl | 2 +- .../src/{dls2_interfaces => dls2_interface}/idl/Pose.idl | 2 +- .../src/{dls2_interfaces => dls2_interface}/idl/Screw.idl | 2 +- .../idl/TrajectoryGenerator.idl | 8 ++++---- .../{dls2_interfaces => dls2_interface}/msg/BaseState.msg | 0 .../msg/BlindState.msg | 0 .../msg/FeetContactState.msg | 0 .../src/{dls2_interfaces => dls2_interface}/msg/Imu.msg | 0 .../src/{dls2_interfaces => dls2_interface}/msg/Pose.msg | 0 .../src/{dls2_interfaces => dls2_interface}/msg/Screw.msg | 0 .../msg/TrajectoryGenerator.msg | 0 .../src/{dls2_interfaces => dls2_interface}/package.xml | 2 +- deploy/run_controller_ros2.py | 2 +- deploy/run_simulator_ros2.py | 2 +- 19 files changed, 16 insertions(+), 16 deletions(-) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/CMakeLists.txt (97%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/LICENSE (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/BaseState.idl (72%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/BlindState.idl (96%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/DlsAnnotation.idl (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/Imu.idl (94%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/Pose.idl (80%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/Screw.idl (80%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/idl/TrajectoryGenerator.idl (85%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/BaseState.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/BlindState.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/FeetContactState.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/Imu.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/Pose.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/Screw.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/msg/TrajectoryGenerator.msg (100%) rename deploy/ros2_ws/src/{dls2_interfaces => dls2_interface}/package.xml (96%) diff --git a/deploy/ros2_ws/src/dls2_interfaces/CMakeLists.txt b/deploy/ros2_ws/src/dls2_interface/CMakeLists.txt similarity index 97% rename from deploy/ros2_ws/src/dls2_interfaces/CMakeLists.txt rename to deploy/ros2_ws/src/dls2_interface/CMakeLists.txt index f885680d..2aae826e 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/CMakeLists.txt +++ b/deploy/ros2_ws/src/dls2_interface/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) -project(dls2_interfaces) +project(dls2_interface) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/deploy/ros2_ws/src/dls2_interfaces/LICENSE b/deploy/ros2_ws/src/dls2_interface/LICENSE similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/LICENSE rename to deploy/ros2_ws/src/dls2_interface/LICENSE diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/BaseState.idl b/deploy/ros2_ws/src/dls2_interface/idl/BaseState.idl similarity index 72% rename from deploy/ros2_ws/src/dls2_interfaces/idl/BaseState.idl rename to deploy/ros2_ws/src/dls2_interface/idl/BaseState.idl index 631239c0..2047263a 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/BaseState.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/BaseState.idl @@ -2,7 +2,7 @@ #include "Pose.idl" #include "Screw.idl" -module dls2_interfaces { +module dls2_interface { module msg { @Robot struct BaseState @@ -15,13 +15,13 @@ module dls2_interfaces { string robot_name; // Base Pose - dls2_interfaces::msg::Pose pose; + dls2_interface::msg::Pose pose; // Base velocity - dls2_interfaces::msg::Screw velocity; + dls2_interface::msg::Screw velocity; // Base acceleration - dls2_interfaces::msg::Screw acceleration; + dls2_interface::msg::Screw acceleration; // Stance status @LimbDataMap sequence stance_status; diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/BlindState.idl b/deploy/ros2_ws/src/dls2_interface/idl/BlindState.idl similarity index 96% rename from deploy/ros2_ws/src/dls2_interfaces/idl/BlindState.idl rename to deploy/ros2_ws/src/dls2_interface/idl/BlindState.idl index 185c1722..3d496f45 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/BlindState.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/BlindState.idl @@ -1,6 +1,6 @@ #include "DlsAnnotation.idl" -module dls2_interfaces { +module dls2_interface { module msg { @Robot @Eigen struct BlindState diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/DlsAnnotation.idl b/deploy/ros2_ws/src/dls2_interface/idl/DlsAnnotation.idl similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/idl/DlsAnnotation.idl rename to deploy/ros2_ws/src/dls2_interface/idl/DlsAnnotation.idl diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/Imu.idl b/deploy/ros2_ws/src/dls2_interface/idl/Imu.idl similarity index 94% rename from deploy/ros2_ws/src/dls2_interfaces/idl/Imu.idl rename to deploy/ros2_ws/src/dls2_interface/idl/Imu.idl index 3a804432..7a4eae82 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/Imu.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/Imu.idl @@ -1,4 +1,4 @@ -module dls2_interfaces { +module dls2_interface { module msg { struct Imu { diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/Pose.idl b/deploy/ros2_ws/src/dls2_interface/idl/Pose.idl similarity index 80% rename from deploy/ros2_ws/src/dls2_interfaces/idl/Pose.idl rename to deploy/ros2_ws/src/dls2_interface/idl/Pose.idl index a6cb6297..582b9885 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/Pose.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/Pose.idl @@ -1,4 +1,4 @@ -module dls2_interfaces { +module dls2_interface { module msg { struct Pose { diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/Screw.idl b/deploy/ros2_ws/src/dls2_interface/idl/Screw.idl similarity index 80% rename from deploy/ros2_ws/src/dls2_interfaces/idl/Screw.idl rename to deploy/ros2_ws/src/dls2_interface/idl/Screw.idl index 05ee4718..2fcbb9e7 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/Screw.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/Screw.idl @@ -1,4 +1,4 @@ -module dls2_interfaces { +module dls2_interface { module msg { struct Screw { diff --git a/deploy/ros2_ws/src/dls2_interfaces/idl/TrajectoryGenerator.idl b/deploy/ros2_ws/src/dls2_interface/idl/TrajectoryGenerator.idl similarity index 85% rename from deploy/ros2_ws/src/dls2_interfaces/idl/TrajectoryGenerator.idl rename to deploy/ros2_ws/src/dls2_interface/idl/TrajectoryGenerator.idl index 7a247bde..fc2c2101 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/idl/TrajectoryGenerator.idl +++ b/deploy/ros2_ws/src/dls2_interface/idl/TrajectoryGenerator.idl @@ -2,7 +2,7 @@ #include "Pose.idl" #include "Screw.idl" -module dls2_interfaces { +module dls2_interface { module msg { @Robot @Eigen struct TrajectoryGenerator @@ -12,11 +12,11 @@ module dls2_interfaces { unsigned long sequence_id; double timestamp; - dls2_interfaces::msg::Pose com_pose; + dls2_interface::msg::Pose com_pose; - dls2_interfaces::msg::Screw com_vel; + dls2_interface::msg::Screw com_vel; - dls2_interfaces::msg::Screw com_acc; + dls2_interface::msg::Screw com_acc; @JointState sequence joints_position; @JointState sequence joints_velocity; diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/BaseState.msg b/deploy/ros2_ws/src/dls2_interface/msg/BaseState.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/BaseState.msg rename to deploy/ros2_ws/src/dls2_interface/msg/BaseState.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/BlindState.msg b/deploy/ros2_ws/src/dls2_interface/msg/BlindState.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/BlindState.msg rename to deploy/ros2_ws/src/dls2_interface/msg/BlindState.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/FeetContactState.msg b/deploy/ros2_ws/src/dls2_interface/msg/FeetContactState.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/FeetContactState.msg rename to deploy/ros2_ws/src/dls2_interface/msg/FeetContactState.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/Imu.msg b/deploy/ros2_ws/src/dls2_interface/msg/Imu.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/Imu.msg rename to deploy/ros2_ws/src/dls2_interface/msg/Imu.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/Pose.msg b/deploy/ros2_ws/src/dls2_interface/msg/Pose.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/Pose.msg rename to deploy/ros2_ws/src/dls2_interface/msg/Pose.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/Screw.msg b/deploy/ros2_ws/src/dls2_interface/msg/Screw.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/Screw.msg rename to deploy/ros2_ws/src/dls2_interface/msg/Screw.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/msg/TrajectoryGenerator.msg b/deploy/ros2_ws/src/dls2_interface/msg/TrajectoryGenerator.msg similarity index 100% rename from deploy/ros2_ws/src/dls2_interfaces/msg/TrajectoryGenerator.msg rename to deploy/ros2_ws/src/dls2_interface/msg/TrajectoryGenerator.msg diff --git a/deploy/ros2_ws/src/dls2_interfaces/package.xml b/deploy/ros2_ws/src/dls2_interface/package.xml similarity index 96% rename from deploy/ros2_ws/src/dls2_interfaces/package.xml rename to deploy/ros2_ws/src/dls2_interface/package.xml index 2ed3ef65..9a4d7b01 100644 --- a/deploy/ros2_ws/src/dls2_interfaces/package.xml +++ b/deploy/ros2_ws/src/dls2_interface/package.xml @@ -1,7 +1,7 @@ - dls2_interfaces + dls2_interface 0.0.0 TODO: Package description root diff --git a/deploy/run_controller_ros2.py b/deploy/run_controller_ros2.py index 259ee401..b3d6a07d 100644 --- a/deploy/run_controller_ros2.py +++ b/deploy/run_controller_ros2.py @@ -12,7 +12,7 @@ import rclpy from rclpy.node import Node from sensor_msgs.msg import Joy -from dls2_interfaces.msg import BaseState, BlindState, Imu, TrajectoryGenerator +from dls2_interface.msg import BaseState, BlindState, Imu, TrajectoryGenerator import time import numpy as np diff --git a/deploy/run_simulator_ros2.py b/deploy/run_simulator_ros2.py index 67c4d9b8..d08791e5 100644 --- a/deploy/run_simulator_ros2.py +++ b/deploy/run_simulator_ros2.py @@ -1,6 +1,6 @@ import rclpy from rclpy.node import Node -from dls2_interfaces.msg import BaseState, BlindState, Imu, TrajectoryGenerator, FeetContactState +from dls2_interface.msg import BaseState, BlindState, Imu, TrajectoryGenerator, FeetContactState import time import numpy as np