Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Pose.idl"
#include "Screw.idl"

module dls2_interfaces {
module dls2_interface {
module msg {
@Robot
struct BaseState
Expand All @@ -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<boolean> stance_status;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "DlsAnnotation.idl"

module dls2_interfaces {
module dls2_interface {
module msg {
@Robot @Eigen
struct BlindState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module dls2_interfaces {
module dls2_interface {
module msg {
struct Imu
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module dls2_interfaces {
module dls2_interface {
module msg {
struct Pose
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module dls2_interfaces {
module dls2_interface {
module msg {
struct Screw
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Pose.idl"
#include "Screw.idl"

module dls2_interfaces {
module dls2_interface {
module msg {
@Robot @Eigen
struct TrajectoryGenerator
Expand All @@ -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<double> joints_position;
@JointState sequence<double> joints_velocity;
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>dls2_interfaces</name>
<name>dls2_interface</name>
<version>0.0.0</version>
<description>TODO: Package description</description>
<maintainer email="marco.marchitto@iit.it">root</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion deploy/run_controller_ros2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/run_simulator_ros2.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading