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 891e14df23cd773b51cdb879709fa1f1438b3c2d..f3de765d94cabe2af2dabaddd36bbf5fa1927dd7 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 @@ -46,7 +46,7 @@ MainWindow::MainWindow(int argc, char **argv, QWidget *parent) : DBChangedSubscriber = nodeHandle.subscribe("/my_GUI/DBChanged", 1, &MainWindow::DBChangedCallback, this); ros::NodeHandle my_nodeHandle("~"); - controllerSetpointPublisher = nodeHandle.advertise<Setpoint>("ControllerSetpoint", 1); + controllerSetpointPublisher = my_nodeHandle.advertise<Setpoint>("ControllerSetpoint", 1); customYAMLloadedPublisher = my_nodeHandle.advertise<std_msgs::Int32>("customYAMLloaded", 1); safeYAMLloadedPublisher = my_nodeHandle.advertise<std_msgs::Int32>("safeYAMLloaded", 1); diff --git a/pps_ws/src/d_fall_pps/param/SafeController.yaml b/pps_ws/src/d_fall_pps/param/SafeController.yaml index d660059e5f17205095bdbaf038ca8a3ae586dd1b..6230202512aa32d5f833cb2e7fe35fa472a4594b 100644 --- a/pps_ws/src/d_fall_pps/param/SafeController.yaml +++ b/pps_ws/src/d_fall_pps/param/SafeController.yaml @@ -18,7 +18,7 @@ estimatorMatrix: [-22.3384, 0.9106] #only for velocity calculation defaultSetpoint: [0.0, 0.0, 0.3, 0.0] #take off and landing parameters (in meters and seconds) -takeOffDistance : 1 -landingDistance : 0.15 +takeOffDistance : 0.7 +landingDistance : 0.1 durationTakeOff : 3 durationLanding : 3 diff --git a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp index e1fd96f12788d0f4dbd9912b94900980d2d82cc6..ab612385896e372eadf69fcff7c3c79ce7ec7946 100644 --- a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp +++ b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp @@ -93,7 +93,7 @@ bool calculateControlOutput(Controller::Request &request, Controller::Response & //Tip: create functions that you call here to keep you code cleaner - + ROS_INFO("custom controller loop");