From d7e24d4ebc9d942895d271839f8c8a995fb73f47 Mon Sep 17 00:00:00 2001
From: roangel <roangel@student.ethz.ch>
Date: Fri, 25 Aug 2017 12:07:05 +0200
Subject: [PATCH] Now in the beginning we have time for Connecting message
---
pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py | 1 +
pps_ws/src/d_fall_pps/launch/Student.launch | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
index 4b4f945b..27a539d6 100755
--- a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
+++ b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
@@ -81,6 +81,7 @@ class PPSRadioClient:
self.status_pub = rospy.Publisher(node_name + '/CrazyRadioStatus', Int32, queue_size=1)
self.PPSClient_command_pub = rospy.Publisher('PPSClient/Command', Int32, queue_size=1)
+ time.sleep(1.0)
# Initialize the CrazyFlie and add callbacks
self._init_cf()
diff --git a/pps_ws/src/d_fall_pps/launch/Student.launch b/pps_ws/src/d_fall_pps/launch/Student.launch
index 5edb6b73..fb7a91d3 100755
--- a/pps_ws/src/d_fall_pps/launch/Student.launch
+++ b/pps_ws/src/d_fall_pps/launch/Student.launch
@@ -1,5 +1,10 @@
<launch>
+ <!-- When we have a GUI, this has to be adapted and included -->
+ <node pkg="d_fall_pps" name="student_GUI" output="screen" type="student_GUI">
+ <!-- <rosparam command="load" file="$(find d_fall_pps)/launch/ControlParams.yaml" /> -->
+ </node>
+
<node pkg="d_fall_pps" name="CrazyRadio" output="screen" type="CrazyRadio.py">
<rosparam command="load" file="$(find d_fall_pps)/param/ClientConfig.yaml" />
</node>
@@ -16,9 +21,6 @@
<node pkg="d_fall_pps" name="CustomControllerService" output="screen" type="CustomControllerService">
</node>
- <!-- When we have a GUI, this has to be adapted and included -->
- <node pkg="d_fall_pps" name="student_GUI" output="screen" type="student_GUI">
- <!-- <rosparam command="load" file="$(find d_fall_pps)/launch/ControlParams.yaml" /> -->
- </node>
+
</launch>
--
GitLab