From 7bbbb117832b4fdb9b69cecba0dc32cf71274d93 Mon Sep 17 00:00:00 2001
From: beuchatp <beuchatp@control.ee.ethz.ch>
Date: Sun, 10 Feb 2019 12:00:10 +0100
Subject: [PATCH] Small changes to header files to get ROS compilation working
after removing the command all buttons
---
.../dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h | 11 +++++++++++
.../dfall_pkg/include/nodes/CentralManagerService.h | 13 -------------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
index 679f7303..fe7ec9b6 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
@@ -38,17 +38,28 @@
#include <QGraphicsSvgItem>
#include <QSvgRenderer>
+
#ifdef CATKIN_MAKE
+// Include the Crazyflie Data Struct
#include "dfall_pkg/CrazyflieData.h"
+// Include other classes
+#include "classes/GetParamtersAndNamespaces.h"
+#else
+// Include the shared definitions
+#include "include/constants_for_qt_compile.h"
#endif
+
+
#ifdef CATKIN_MAKE
using namespace dfall_pkg;
#endif
+
#define DRONE_HEIGHT 100 * FROM_MILIMETERS_TO_UNITS * 1.2
#define DRONE_WIDTH 100 * FROM_MILIMETERS_TO_UNITS * 1.2
+
class crazyFly : public QGraphicsSvgItem
{
public:
diff --git a/dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h b/dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h
index 0c02248e..5079edfe 100644
--- a/dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h
+++ b/dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h
@@ -82,19 +82,6 @@
#define ENTRY_INSERT_OR_UPDATE 1
#define ENTRY_REMOVE 2
-// For which controller parameters to load
-#define LOAD_YAML_SAFE_CONTROLLER_AGENT 1
-#define LOAD_YAML_DEMO_CONTROLLER_AGENT 2
-#define LOAD_YAML_SAFE_CONTROLLER_COORDINATOR 3
-#define LOAD_YAML_DEMO_CONTROLLER_COORDINATOR 4
-
-// For which controller parameters and from where to fetch
-#define FETCH_YAML_SAFE_CONTROLLER_FROM_OWN_AGENT 1
-#define FETCH_YAML_DEMO_CONTROLLER_FROM_OWN_AGENT 2
-#define FETCH_YAML_SAFE_CONTROLLER_FROM_COORDINATOR 3
-#define FETCH_YAML_DEMO_CONTROLLER_FROM_COORDINATOR 4
-
-
using namespace dfall_pkg;
using namespace std;
--
GitLab