From 3eb83f31ea54cf89f08e96fead4fa13b32644e27 Mon Sep 17 00:00:00 2001
From: Angel <roangel@student.ethz.ch>
Date: Wed, 20 Sep 2017 17:29:00 +0200
Subject: [PATCH] small bug
---
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp | 1 -
pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
index 60f8f8c9..979ff704 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
@@ -59,7 +59,6 @@ MainWindow::MainWindow(int argc, char **argv, QWidget *parent) :
PPSClientCommandPublisher = nh_PPSClient.advertise<std_msgs::Int32>("Command", 1);
-
// First get student ID
if(!nh_PPSClient.getParam("studentID", m_student_id))
{
diff --git a/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp b/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp
index 97725c52..355d02cb 100644
--- a/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp
+++ b/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp
@@ -219,10 +219,12 @@ int main(int argc, char* argv[]) {
loadParameters(nodeHandle);
int student_id;
- ros::NodeHandle namespace_nodeHandle(ros::this_node::getNamespace());
+ std::string namespace = ros::this_node::getNamespace();
+ ros::NodeHandle PPSClient_nodeHandle(namespace + "/PPSClient");
+
if(!namespace_nodeHandle.getParam("studentID", student_id))
{
- ROS_ERROR("Failed to get studentID");
+ ROS_ERROR("Failed to get studentID from FollowN_1Service");
}
followPublisher = nodeHandle.advertise<Setpoint>("/" + std::to_string(student_id) + "/FollowN_1Service/FollowTopic", 1);
--
GitLab