FHWS/FtmPrologic
Archived
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added gen7 NUCs and path 10/11

Browse Source
This commit is contained in:
Markus Bullmann
2019-11-13 16:16:53 +01:00
parent ac824937aa
commit 9700f88449
3 changed files with 104 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
code/Settings.h
View File

@@ -16,10 +16,17 @@ namespace Settings {
/** describes one dataset (map, training, parameter-estimation, ...) */
// NUC Gen6 - Intel AC 8260
const MACAddress NUC1("38:de:ad:6d:77:25");
const MACAddress NUC2("38:de:ad:6d:60:ff");
const MACAddress NUC3("1c:1b:b5:ef:a2:9a");
const MACAddress NUC4("1c:1b:b5:ec:d1:82");
// NUC Gen7 - Intel AC 9461
const MACAddress NUC5("d0:c6:37:bc:5c:41");
const MACAddress NUC6("d0:c6:37:bc:77:8a");
const MACAddress NUC7("d0:c6:37:bc:77:ad");
const MACAddress NUC8("d0:c6:37:bc:6b:4b");
static int nucIndex(const MACAddress& addr)
{
@@ -27,6 +34,10 @@ namespace Settings {
if (addr == Settings::NUC2) return 1;
if (addr == Settings::NUC3) return 2;
if (addr == Settings::NUC4) return 3;
if (addr == Settings::NUC5) return 4;
if (addr == Settings::NUC6) return 5;
if (addr == Settings::NUC7) return 6;
if (addr == Settings::NUC8) return 7;
else {
assert(false); return 0;
}
@@ -40,6 +51,10 @@ namespace Settings {
case 1: return NUC2;
case 2: return NUC3;
case 3: return NUC4;
case 4: return NUC5;
case 5: return NUC6;
case 6: return NUC7;
case 7: return NUC8;
default: assert(false); return NUC1;
}
}
@@ -285,8 +300,53 @@ namespace Settings {
{ 200, 201, 203, 104, 204, 205, 206, 207, 206, 208, 209, 210, 211, 212 },
true
};
// 10 Path: SHL Path 2; NUCs steht in den Räumen; Neue gen7 NUCs mit interner Antenne
const DataSetup Path10 = {
"path10",
mapDir + "shl_nuc_2.xml",
{
dataDir + "Pixel2/path10/1470971060974.csv",
dataDir + "Pixel2/path10/1578633767584.csv",
dataDir + "Pixel3/path10/3600316210200.csv",
dataDir + "Pixel3/path10/3715912582913.csv",
},
{
// NUC, ID Pos X Y Z offset loss kalman stddev
{ NUC1, {1, { 7, 6, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 1 I.2.14
{ NUC5, {5, { 54, 46, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 5 I.2.37
{ NUC6, {6, { 46, 37, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 6 I.2.03
{ NUC7, {7, { 27, 45, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 7 I.2.28
{ NUC8, {8, { 16, 36, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 8 I.2.10
},
{ 100, 101, 102, 103, 104, 103, 102, 101, 100 },
true
};
// 11 Path: SHL Path 2; NUCs steht in den Räumen; Neue gen7 NUCs mit interner Antenne
const DataSetup Path11 = {
"path11",
mapDir + "shl_nuc_2.xml",
{
dataDir + "Pixel2/path11/1688129692555.csv",
dataDir + "Pixel2/path11/1841800940572.csv",
dataDir + "Pixel3/path11/3833358280134.csv",
dataDir + "Pixel3/path11/3997838116311.csv",
},
{
// NUC, ID Pos X Y Z offset loss kalman stddev
{ NUC1, {1, { 7, 6, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 1 I.2.14
{ NUC5, {5, { 54, 46, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 5 I.2.37
{ NUC6, {6, { 46, 37, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 6 I.2.03
{ NUC7, {7, { 27, 45, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 7 I.2.28
{ NUC8, {8, { 16, 36, 0.8}, 0.00, 2.500, 3.0f} }, // NUC 8 I.2.10
},
{ 100, 101, 102, 103, 104, 105, 104, 103, 102, 101, 100 },
true
};
} data;
static DataSetup CurrentPath = data.Path9;
static DataSetup CurrentPath = data.Path10;
}