Commit 69807b0f authored by beuchatp's avatar beuchatp
Browse files

Merge branch 'add_battery_monitor_node' of...

Merge branch 'add_battery_monitor_node' of gitlab.ethz.ch:D-FaLL/PandS-System/D-FaLL-System into add_battery_monitor_node
Forgot to pull before committing
parents 11815826 7bbbb117
......@@ -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:
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment