Commit 30b0edad authored by beuchatp's avatar beuchatp
Browse files

Small corrections to be test in the lab

parent 1ddd359e
......@@ -49,7 +49,7 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/AreaBounds.h"
#include "d_fall_pps/CrazyflieContext.h"
#include "d_fall_pps/CMQuery.h"
......
......@@ -219,10 +219,10 @@ void TopBanner::loadCrazyflieContext()
void TopBanner::on_emergency_stop_button_clicked()
{
#ifdef CATKIN_MAKE
d_fall_pps::IntWithHeader msg;
fillIntMessageHeader(msg);
msg.data = CMD_RECONNECT;
this->crazyRadioCommandPublisher.publish(msg);
// d_fall_pps::IntWithHeader msg;
// fillIntMessageHeader(msg);
// msg.data = CMD_RECONNECT;
// this->crazyRadioCommandPublisher.publish(msg);
ROS_INFO("[TOP BANNER GUI] EMERGENCY STOP button clicked");
#endif
}
......
# TO RUN THE SYSTEM FULLY ON THE LOCAL COMPUTER:
export ROS_MASTER_URI=http://localhost:11311
# export ROS_MASTER_URI=http://localhost:11311
# TO RUN THE SYSTEM ON A DEFAULT CONFIGURATION OF THE NETWROK:
# export ROS_MASTER_URI=http://teacher:11311
export ROS_MASTER_URI=http://teacher:11311
# OTHER NECESSARY ENVIRONMENT VARIABLES:
export ROS_IP=$(hostname -I | awk '{print $1;}')
export DFALL_DEFAULT_AGENT_ID=$(cat /etc/dfall_default_agent_id)
......
<launch>
<node pkg="d_fall_pps" name="CentralManagerService" output="screen" type="CentralManagerService">
<!-- CENTRAL MANAGER -->
<node
pkg="d_fall_pps"
name="CentralManagerService"
output="screen"
type="CentralManagerService"
>
</node>
<node pkg="d_fall_pps" name="ViconDataPublisher" output="screen" type="ViconDataPublisher">
<!-- VICON DATA PUBLISHER -->
<node
pkg="d_fall_pps"
name="ViconDataPublisher"
output="screen"
type="ViconDataPublisher"
>
<rosparam command="load" file="$(find d_fall_pps)/param/ViconConfig.yaml" />
</node>
<!-- When we have a GUI, this has to be adapted and included -->
<node pkg="d_fall_pps" name="my_GUI" output="screen" type="my_GUI">
<!-- TEACHER GUI -->
<node
pkg="d_fall_pps"
name="my_GUI"
output="screen"
type="my_GUI"
>
</node>
</launch>
Supports Markdown
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