Commit 4381a8fa authored by roangel's avatar roangel
Browse files

we have corrected the addresses. We have also changed the names of files LUT

parent 3a13459b
......@@ -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
)
......
......@@ -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
#include "addressLUT.h"
std::map<std::string, std::string> address_LUT
{
{"CF1", "A12D2"},
{"CF2", "E341E"},
{"CF3", "4E21A"},
};
#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"},
};
......@@ -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);
......
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
......@@ -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;
......
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