Commit d13ccca8 authored by Christian Sponfeldner's avatar Christian Sponfeldner

change file structure according to ROS standards

parent 3c2a13f2
......@@ -12,13 +12,13 @@
#include "geometry_msgs/Twist.h"
#include "tf/transform_broadcaster.h"
#include "nav_msgs/Odometry.h"
#include "ethprotocol.h"
#include "emros_commands.h"
#include "utility_ofc/ethprotocol.h"
#include "emros_common/emros_commands.h"
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <leaky_bucket_timeout.h>
#include "utility_ofc/leaky_bucket_timeout.h"
#include "kinematics.hpp"
#include "velocities.h"
#include "emros_common/velocities.h"
#include <cmath>
......
......@@ -13,8 +13,8 @@
#include "geometry_msgs/Twist.h"
#include "tf/transform_broadcaster.h"
#include "nav_msgs/Odometry.h"
#include "emros_commands.h"
#include "velocities.h"
#include "emros_common/emros_commands.h"
#include "emros_common/velocities.h"
using namespace EMROSCmdType::Basecontroller;
......
......@@ -6,7 +6,7 @@
*/
#include "emros_basecontroller/basecontroller.hpp"
#include "emros_commands.h"
#include "emros_common/emros_commands.h"
#include "ros/ros.h"
#include <iostream>
......
......@@ -3,7 +3,7 @@
<launch>
<!-- DISPATCHER -->
<arg name="IP_EM5" value="192.168.60.223" />
<arg name="IP_EM5" value="192.168.60.142" />
<arg name="Port_EM5" value="65000" />
<include file="$(find emros_dispatcher)/launch/dispatcher.launch" >
......
Subproject commit e760644f8625a2f7dd70986657fe601a2a7e1cb0
Subproject commit e46ba29f56099a94fef526ebb82dffbcbec4c14a
......@@ -11,12 +11,12 @@
#include "ros/ros.h"
#include <signal.h>
#include "emros_dispatcher/eth.h"
#include "ethprotocol.h"
#include "emros_commands.h"
#include "utility_ofc/ethprotocol.h"
#include "emros_common/emros_commands.h"
#include "udpsocket.h"
#include "iostream"
#include "timeout.h"
#include <leaky_bucket_timeout.h>
#include "utility_ofc/timeout.h"
#include "utility_ofc/leaky_bucket_timeout.h"
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
......
......@@ -21,7 +21,7 @@
#include <fcntl.h>
#include "ros/ros.h"
#include "ethprotocol.h"
#include "utility_ofc/ethprotocol.h"
......
......@@ -5,7 +5,7 @@
* Author: speckle_s
*/
#include "dispatcher.h"
#include "../include/emros_dispatcher/dispatcher.h"
Dispatcher* Dispatcher::me;
......
......@@ -5,7 +5,7 @@
* Author: speckle_s
*/
#include "udpsocket.h"
#include "emros_dispatcher/udpsocket.h"
UdpSocket::UdpSocket() :
mPort(), mFd(), mSourceAddr(), mTargetaddr(), error(false), mTargetIP(), mSourceIP(), mTimeout()
......
Subproject commit 2fe4492058a109a20042c92282b42607c77f2eae
Subproject commit 84e0de4b34500ed7eb7b1ddaefd89f3e49541498
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