From 170bad394138411e2d33e650279c67b7919c8d73 Mon Sep 17 00:00:00 2001
From: bucyril <bucyril@ethz.ch>
Date: Mon, 22 May 2017 11:13:13 +0200
Subject: [PATCH] jjdsaojfd
---
pps_ws/src/d_fall_pps/param/Crazyflie.db | 2 ++
pps_ws/src/d_fall_pps/src/PPSClient.cpp | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
create mode 100644 pps_ws/src/d_fall_pps/param/Crazyflie.db
diff --git a/pps_ws/src/d_fall_pps/param/Crazyflie.db b/pps_ws/src/d_fall_pps/param/Crazyflie.db
new file mode 100644
index 00000000..9192d0d6
--- /dev/null
+++ b/pps_ws/src/d_fall_pps/param/Crazyflie.db
@@ -0,0 +1,2 @@
+3,cfThree,0/72/2M,0,0,0,1,1,1
+5,cfFour,0/99/2M,-1,0,0,0,1,1
diff --git a/pps_ws/src/d_fall_pps/src/PPSClient.cpp b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
index a76b60d3..7797b13d 100755
--- a/pps_ws/src/d_fall_pps/src/PPSClient.cpp
+++ b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
@@ -39,8 +39,6 @@
using namespace d_fall_pps;
-//name of the student team
-std::string teamName;
//name of the crazyflie, as specified in Vicon
std::string crazyflieName;
//studentID, gives namespace and identifier in CentralManagerService
@@ -93,7 +91,7 @@ void viconCallback(const ViconData& viconData) {
//ROS_INFO_STREAM(data);
- if(data.crazyflieName == crazyflieName) {
+ if(data.crazyflieName == context.crazyflieName) {
Controller controllerCall;
controllerCall.request.ownCrazyflie = data;
@@ -135,10 +133,6 @@ void viconCallback(const ViconData& viconData) {
}
void loadParameters(ros::NodeHandle& nodeHandle) {
- if(!nodeHandle.getParam("teamName", teamName)) {
- ROS_ERROR("Failed to get teamName");
- }
-
if(!nodeHandle.getParam("crazyFlieName", crazyflieName)) {
ROS_ERROR("Failed to get crazyFlieName");
}
--
GitLab