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 6249adf9be9ff9cd90b2c1b5cf659936a1f1d67e..41cb4ba7dae86dd1ae0832916cdb4f6182cbcf7a 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 @@ -1101,7 +1101,7 @@ void MainWindow::on_demoButton_2_clicked() ROS_INFO("Demo button 2 pressed in GUI"); } -void MainWindow::on_customButton_3_clicked() +void MainWindow::on_demoButton_3_clicked() { CustomButton msg_custom_button; msg_custom_button.button_index = 3; @@ -1138,7 +1138,7 @@ void MainWindow::on_studentButton_3_clicked() { CustomButton msg_custom_button; msg_custom_button.button_index = 3; - msg_custom_button.command_code = (ui->demoField_3->text()).toFloat(); + msg_custom_button.command_code = (ui->studentField_3->text()).toFloat(); this->studentCustomButtonPublisher.publish(msg_custom_button); ROS_INFO("Student button 3 pressed in GUI"); } diff --git a/pps_ws/src/d_fall_pps/include/nodes/StudentControllerService.h b/pps_ws/src/d_fall_pps/include/nodes/StudentControllerService.h index 9d393097a28b98cf91100c697cdd1c2c1a2b1cb5..9c15a5341b35fe8dba9d6e9550d78d8f8b9b12e1 100644 --- a/pps_ws/src/d_fall_pps/include/nodes/StudentControllerService.h +++ b/pps_ws/src/d_fall_pps/include/nodes/StudentControllerService.h @@ -57,6 +57,7 @@ #include "d_fall_pps/Controller.h" #include "d_fall_pps/DebugMsg.h" #include "d_fall_pps/CustomControllerYAML.h" +#include "d_fall_pps/CustomButton.h" // Include the Parameter Service shared definitions #include "nodes/ParameterServiceDefinitions.h"