Commit 08ace8b2 authored by Christian Sponfeldner's avatar Christian Sponfeldner

Adopted new attributes/velocities interfaces

parent 4a784409
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "utility_ofc/leaky_bucket_timeout.h" #include "utility_ofc/leaky_bucket_timeout.h"
#include "kinematics.hpp" #include "kinematics.hpp"
#include "emros_common/velocities.h" #include "emros_common/attributes.h"
#include <cmath> #include <cmath>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "tf/transform_broadcaster.h" #include "tf/transform_broadcaster.h"
#include "nav_msgs/Odometry.h" #include "nav_msgs/Odometry.h"
#include "emros_common/emros_commands.h" #include "emros_common/emros_commands.h"
#include "emros_common/velocities.h" #include "emros_common/attributes.h"
#include <math.h> #include <math.h>
using namespace EMROSCmdType::Basecontroller; using namespace EMROSCmdType::Basecontroller;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<launch> <launch>
<!-- DISPATCHER --> <!-- DISPATCHER -->
<arg name="IP_EM5" value="192.168.60.143" /> <arg name="IP_EM5" value="192.168.60.142" />
<arg name="Port_EM5" value="65000" /> <arg name="Port_EM5" value="65000" />
<include file="$(find emros_dispatcher)/launch/dispatcher.launch" > <include file="$(find emros_dispatcher)/launch/dispatcher.launch" >
......
Subproject commit 689a0a221d557e1f9cb85b613546959c2d6e7a40 Subproject commit 66d9097972bcf004bec6d6868b7f816103edd9f2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment