From 24e65e7eb69ecdd742200f3ff93f37ebb75134b0 Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Mon, 27 Aug 2018 13:34:38 +0200
Subject: [PATCH] fixed small bugs for command button 3 in student GUI
---
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp | 4 ++--
.../src/d_fall_pps/include/nodes/StudentControllerService.h | 1 +
2 files changed, 3 insertions(+), 2 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 6249adf9..41cb4ba7 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 9d393097..9c15a534 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"
--
GitLab