diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp index 2f790f7e41b589cb8d2058b027963b71ee6f91b5..32e7dc0209d9d661caa42aa7f83954f416725987 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp @@ -871,7 +871,7 @@ void MainGUIWindow::on_save_in_DB_button_clicked() tmp_entry.crazyflieContext.localArea.ymax = y_max * FROM_UNITS_TO_METERS; tmp_entry.crazyflieContext.localArea.zmin = -0.2; - tmp_entry.crazyflieContext.localArea.zmax = 1.2; + tmp_entry.crazyflieContext.localArea.zmax = 2.2; } } tmp_db.crazyflieEntries.push_back(tmp_entry); diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp index cae1ed0efaae8a4b3cdc13b41e838080ab6eb344..ab9fd2c53bea71d10599a389b86152944b4823b5 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp @@ -75,12 +75,14 @@ bool rosNodeThread::init() ros::Time::init(); ros::NodeHandle nh("~"); - m_vicon_subscriber = nh.subscribe("/ViconDataPublisher/ViconData", 100, &rosNodeThread::messageCallback, this); + ros::NodeHandle nodeHandle_dfall_root("/dfall"); + + m_vicon_subscriber = nodeHandle_dfall_root.subscribe("ViconDataPublisher/ViconData", 100, &rosNodeThread::messageCallback, this); // clients for db services: - m_read_db_client = nh.serviceClient<CMRead>("/CentralManagerService/Read", false); - m_update_db_client = nh.serviceClient<CMUpdate>("/CentralManagerService/Update", false); - m_command_db_client = nh.serviceClient<CMCommand>("/CentralManagerService/Command", false); + m_read_db_client = nodeHandle_dfall_root.serviceClient<CMRead>("CentralManagerService/Read", false); + m_update_db_client = nodeHandle_dfall_root.serviceClient<CMUpdate>("CentralManagerService/Update", false); + m_command_db_client = nodeHandle_dfall_root.serviceClient<CMCommand>("CentralManagerService/Command", false); m_pThread->start(); return true;