From 4381a8fa192998181957694d41fd82233e6749ff Mon Sep 17 00:00:00 2001
From: roangel <roangel@student.ethz.ch>
Date: Wed, 16 Aug 2017 17:16:39 +0200
Subject: [PATCH] we have corrected the addresses. We have also changed the
names of files LUT
---
pps_ws/src/d_fall_pps/CMakeLists.txt | 2 +-
.../include/{addressLUT.h => channelLUT.h} | 2 +-
.../GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp | 9 ---------
.../GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp | 13 +++++++++++++
.../GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp | 6 +++---
pps_ws/src/d_fall_pps/param/Crazyflie.db | 4 +---
pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp | 2 +-
7 files changed, 20 insertions(+), 18 deletions(-)
rename pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/{addressLUT.h => channelLUT.h} (60%)
delete mode 100644 pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp
create mode 100644 pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
diff --git a/pps_ws/src/d_fall_pps/CMakeLists.txt b/pps_ws/src/d_fall_pps/CMakeLists.txt
index 5aa50bc4..812daab1 100755
--- a/pps_ws/src/d_fall_pps/CMakeLists.txt
+++ b/pps_ws/src/d_fall_pps/CMakeLists.txt
@@ -237,7 +237,7 @@ set(MY_CPP_SOURCES # compilation of sources
${MY_LIB_PATH_SRC}/rosNodeThread.cpp
${MY_LIB_PATH_SRC}/crazyFly.cpp
${MY_LIB_PATH_SRC}/CFLinker.cpp
- ${MY_LIB_PATH_SRC}/addressLUT.cpp
+ ${MY_LIB_PATH_SRC}/channelLUT.cpp
)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
similarity index 60%
rename from pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h
rename to pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
index ac92f871..e521fc39 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
@@ -5,6 +5,6 @@
#include <map>
-extern std::map<std::string, std::string> address_LUT;
+extern std::map<std::string, std::string> channel_LUT;
#endif
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp
deleted file mode 100644
index 6210de02..00000000
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "addressLUT.h"
-
-
-std::map<std::string, std::string> address_LUT
-{
- {"CF1", "A12D2"},
- {"CF2", "E341E"},
- {"CF3", "4E21A"},
-};
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
new file mode 100644
index 00000000..dc8e61f1
--- /dev/null
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
@@ -0,0 +1,13 @@
+#include "channelLUT.h"
+
+
+std::map<std::string, std::string> channel_LUT
+{
+ // {"CF1", "A12D2"},
+ // {"CF2", "E341E"},
+ // {"CF3", "4E21A"},
+ {"cfOne", "0/76/2M"},
+ {"cfTwo", "0/69/2M"},
+ {"cfThree", "0/72/2M"},
+ {"cfFour", "0/99/2M"},
+};
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
index 606e5432..61736d57 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
@@ -3,7 +3,7 @@
#include "crazyFlyZoneTab.h"
#include "myGraphicsScene.h"
#include "myGraphicsView.h"
-#include "addressLUT.h"
+#include "channelLUT.h"
#include <QObject>
#include <QDoubleSpinBox>
@@ -884,8 +884,8 @@ void MainGUIWindow::on_load_from_DB_button_clicked()
void MainGUIWindow::on_comboBoxCFs_currentTextChanged(const QString &arg1)
{
std::string key = arg1.toStdString();
- auto it = address_LUT.find(key);
- if(it != address_LUT.end())
+ auto it = channel_LUT.find(key);
+ if(it != channel_LUT.end())
{
std::string found = it->second;
QString found_qstr = QString::fromStdString(found);
diff --git a/pps_ws/src/d_fall_pps/param/Crazyflie.db b/pps_ws/src/d_fall_pps/param/Crazyflie.db
index 2c6f791e..cf9a23ba 100644
--- a/pps_ws/src/d_fall_pps/param/Crazyflie.db
+++ b/pps_ws/src/d_fall_pps/param/Crazyflie.db
@@ -1,3 +1 @@
-1,CF1,A12D2,0,0.180387,0.712283,-0.2,1.77763,1.34043,2
-2,CF2,E341E,1,-0.628728,-0.48753,-0.2,0.971272,0.52247,2
-3,CF3,4E21A,2,0.425248,-1.49146,-0.2,1.66704,-0.577371,2
+2,cfOne,0/76/2M,0,-4.33627,-2.87329,-0.2,4.64523,3.23321,2
diff --git a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
index ec636e50..2067c20e 100755
--- a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
+++ b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
@@ -20,7 +20,7 @@
#include "d_fall_pps/ViconData.h"
#include "d_fall_pps/UnlabeledMarker.h"
-#define TESTING_FAKE_DATA
+// #define TESTING_FAKE_DATA
// notice that unit here are in milimeters
using namespace ViconDataStreamSDK::CPP;
--
GitLab