diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..87e654b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.csv filter=lfs diff=lfs merge=lfs -text diff --git a/code/Settings.h b/code/Settings.h index 86148d8..63b60ab 100644 --- a/code/Settings.h +++ b/code/Settings.h @@ -371,6 +371,98 @@ namespace Settings { true }; + + // 20 Path: SHL Path I; NUCs steht in den Räumen; Neue gen7 NUCs mit interner Antenne + const DataSetup Path20 = { + "path20", + mapDir + "shl_nuc_3.xml", + { + dataDir + "Pixel2/path20/17706322854245.csv", + dataDir + "Pixel2/path20/17818434531611.csv", + dataDir + "Pixel2/path20/18373053262232.csv", + dataDir + "Pixel2/path20/18507853186546.csv", + + dataDir + "Pixel3/path20/16666156600490.csv", + dataDir + "Pixel3/path20/16779582215695.csv", + dataDir + "Pixel3/path20/16926680479359.csv", + dataDir + "Pixel3/path20/17037535703892.csv", + }, + { + // NUC, ID Pos X Y Z offset loss kalman stddev + { NUC1, {1, { 67 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 1 + { NUC2, {2, { 27 , 49.6, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 2 + { NUC3, {3, { 15 , 32.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 3 + { NUC4, {4, { 14.6, 4.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 4 + { NUC5, {5, { 52.2, 49.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 5 + { NUC6, {6, { 38 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 6 + { NUC7, {7, { 5 , 49.8, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 7 + { NUC8, {8, { 2 , 21.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 8 + }, + { 100, 101, 102, 103, 104, 103, 102, 101, 100 }, + true + }; + + // 21 Path: SHL Path großes L; NUCs steht in den Räumen; Neue gen7 NUCs mit interner Antenne + const DataSetup Path21 = { + "path21", + mapDir + "shl_nuc_3.xml", + { + dataDir + "Pixel2/path21/17368267427912.csv", + dataDir + "Pixel2/path21/17527721931557.csv", + dataDir + "Pixel2/path21/18001426901565.csv", + dataDir + "Pixel2/path21/18177010770775.csv", + + dataDir + "Pixel3/path21/15786943753685.csv", + dataDir + "Pixel3/path21/16075928276171.csv", + dataDir + "Pixel3/path21/16268193326887.csv", + dataDir + "Pixel3/path21/16424251083631.csv", + }, + { + // NUC, ID Pos X Y Z offset loss kalman stddev + { NUC1, {1, { 67 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 1 + { NUC2, {2, { 27 , 49.6, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 2 + { NUC3, {3, { 15 , 32.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 3 + { NUC4, {4, { 14.6, 4.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 4 + { NUC5, {5, { 52.2, 49.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 5 + { NUC6, {6, { 38 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 6 + { NUC7, {7, { 5 , 49.8, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 7 + { NUC8, {8, { 2 , 21.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 8 + }, + { 100, 101, 102, 103, 104, 105, 104, 103, 102, 101, 100 }, + true + }; + + + + // 22 Path: SHL Komplexer Pfad von Balzer zu Deinzer zu Pool Raum und Gang; NUCs steht in den Räumen; Neue gen7 NUCs mit interner Antenne + const DataSetup Path22 = { + "path21", + mapDir + "shl_nuc_3.xml", + { + dataDir + "Pixel2/path22/20823227234371.csv", + dataDir + "Pixel2/path22/21041583616592.csv", + dataDir + "Pixel2/path22/21254258832883.csv", + dataDir + "Pixel2/path22/21408875875733.csv", + + dataDir + "Pixel3/path22/19916193051892.csv", + dataDir + "Pixel3/path22/20083784919629.csv", + dataDir + "Pixel3/path22/20307809441061.csv", + dataDir + "Pixel3/path22/20475021182927.csv", + }, + { + // NUC, ID Pos X Y Z offset loss kalman stddev + { NUC1, {1, { 67 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 1 + { NUC2, {2, { 27 , 49.6, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 2 + { NUC3, {3, { 15 , 32.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 3 + { NUC4, {4, { 14.6, 4.4, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 4 + { NUC5, {5, { 52.2, 49.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 5 + { NUC6, {6, { 38 , 33 , 0.8}, -2.00, 3.000, 3.0f} }, // NUC 6 + { NUC7, {7, { 5 , 49.8, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 7 + { NUC8, {8, { 2 , 21.5, 0.8}, -2.00, 3.000, 3.0f} }, // NUC 8 + }, + { 200, 201, 203, 104, 204, 205, 206, 207, 206, 208, 209, 210, 211, 212 }, + true + }; } data; static DataSetup CurrentPath = data.Path11; diff --git a/code/main.cpp b/code/main.cpp index f6e05fc..2b7386a 100644 --- a/code/main.cpp +++ b/code/main.cpp @@ -698,7 +698,10 @@ int main(int argc, char** argv) //Settings::data.Path8, //Settings::data.Path9, //Settings::data.Path10, - Settings::data.Path11 + //Settings::data.Path11 + //Settings::data.Path20, + //Settings::data.Path21, + Settings::data.Path22, }; for (Settings::DataSetup setupToRun : setupsToRun) diff --git a/map/shl_nuc_2.xml b/map/shl_nuc_2.xml new file mode 100644 index 0000000..b6ca689 --- /dev/null +++ b/map/shl_nuc_2.xml @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/map/shl_nuc_3.xml b/map/shl_nuc_3.xml new file mode 100644 index 0000000..ea4e5a4 --- /dev/null +++ b/map/shl_nuc_3.xml @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/measurements/data/Pixel2/path20/17706322854245.csv b/measurements/data/Pixel2/path20/17706322854245.csv new file mode 100644 index 0000000..b30a240 --- /dev/null +++ b/measurements/data/Pixel2/path20/17706322854245.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fba7542379a6573d2a5447bdd4c0673a76a39ade9c7f8df509d69ee0668c3fd +size 10868006 diff --git a/measurements/data/Pixel2/path20/17818434531611.csv b/measurements/data/Pixel2/path20/17818434531611.csv new file mode 100644 index 0000000..6f44b87 --- /dev/null +++ b/measurements/data/Pixel2/path20/17818434531611.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2f7297862afbb27bafdfb649f9c904c5493159dfa802847cdf2921bfc755767 +size 10939295 diff --git a/measurements/data/Pixel2/path20/18373053262232.csv b/measurements/data/Pixel2/path20/18373053262232.csv new file mode 100644 index 0000000..ebfc5bb --- /dev/null +++ b/measurements/data/Pixel2/path20/18373053262232.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06e38cfd015e32428e55758f1f51e1b6d7602643a7ae3dd04148e26b72870d67 +size 12135676 diff --git a/measurements/data/Pixel2/path20/18507853186546.csv b/measurements/data/Pixel2/path20/18507853186546.csv new file mode 100644 index 0000000..c53bdeb --- /dev/null +++ b/measurements/data/Pixel2/path20/18507853186546.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a555eb0c31eeec6cc68b324555c37a0fc50828d979b501c7e3663ae1a6266149 +size 17712171 diff --git a/measurements/data/Pixel2/path21/17368267427912.csv b/measurements/data/Pixel2/path21/17368267427912.csv new file mode 100644 index 0000000..c3e17b4 --- /dev/null +++ b/measurements/data/Pixel2/path21/17368267427912.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0da5ed7a14c016255e0bbfb8e31eea924160d748da98aa449b28d168a5516b3 +size 14504120 diff --git a/measurements/data/Pixel2/path21/17527721931557.csv b/measurements/data/Pixel2/path21/17527721931557.csv new file mode 100644 index 0000000..d8efc0f --- /dev/null +++ b/measurements/data/Pixel2/path21/17527721931557.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92df70bca09c5b6b44816c97ae48a0729515ae6825760cc5035ff5b38b811d10 +size 18138156 diff --git a/measurements/data/Pixel2/path21/18001426901565.csv b/measurements/data/Pixel2/path21/18001426901565.csv new file mode 100644 index 0000000..fe45bc0 --- /dev/null +++ b/measurements/data/Pixel2/path21/18001426901565.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47826643e66992f31f373c94802416e3916d40e56c249cd890a58af643b47320 +size 16091045 diff --git a/measurements/data/Pixel2/path21/18177010770775.csv b/measurements/data/Pixel2/path21/18177010770775.csv new file mode 100644 index 0000000..a2645bc --- /dev/null +++ b/measurements/data/Pixel2/path21/18177010770775.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6f3b7bc6b5bbb8931d0206228de4c6894760ced1f18306885f7c1a381b109f2 +size 18109117 diff --git a/measurements/data/Pixel2/path22/20823227234371.csv b/measurements/data/Pixel2/path22/20823227234371.csv new file mode 100644 index 0000000..368a2bd --- /dev/null +++ b/measurements/data/Pixel2/path22/20823227234371.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20f29810e9fa448d3705ad44a93fb3f878061c948ecc17168ad092a796a40f4f +size 11675227 diff --git a/measurements/data/Pixel2/path22/21041583616592.csv b/measurements/data/Pixel2/path22/21041583616592.csv new file mode 100644 index 0000000..adc4c19 --- /dev/null +++ b/measurements/data/Pixel2/path22/21041583616592.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59cbc252a43901d516f5ab611c7c0ceeb226b1ecb72f94f5dcdd7800f4ff3a15 +size 14282473 diff --git a/measurements/data/Pixel2/path22/21254258832883.csv b/measurements/data/Pixel2/path22/21254258832883.csv new file mode 100644 index 0000000..a88964a --- /dev/null +++ b/measurements/data/Pixel2/path22/21254258832883.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a8ad6a2de73cd84af44a95a00e86471781a126fbb0e74eb6fa180138b241ac0 +size 9921523 diff --git a/measurements/data/Pixel2/path22/21408875875733.csv b/measurements/data/Pixel2/path22/21408875875733.csv new file mode 100644 index 0000000..ec75dc0 --- /dev/null +++ b/measurements/data/Pixel2/path22/21408875875733.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c92b8e32ec1c38578ef5a120b748032493b98ae1b752ed2aa06936bca8bd80cb +size 10512136 diff --git a/measurements/data/Pixel3/path20/16666156600490.csv b/measurements/data/Pixel3/path20/16666156600490.csv new file mode 100644 index 0000000..3d746ef --- /dev/null +++ b/measurements/data/Pixel3/path20/16666156600490.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8b5efa3a445ddbdac0185355a43b1d6f0660da9c097f9207432615f0da319f2 +size 11197655 diff --git a/measurements/data/Pixel3/path20/16779582215695.csv b/measurements/data/Pixel3/path20/16779582215695.csv new file mode 100644 index 0000000..816735b --- /dev/null +++ b/measurements/data/Pixel3/path20/16779582215695.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b188a90636aba46502323d7427a4e0cacd8fe74bf5e36077c7c11581f42f8bbe +size 13831653 diff --git a/measurements/data/Pixel3/path20/16926680479359.csv b/measurements/data/Pixel3/path20/16926680479359.csv new file mode 100644 index 0000000..1882b2a --- /dev/null +++ b/measurements/data/Pixel3/path20/16926680479359.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4fb0690e19f9e7aa9440d526df0352614e54d8e78c21e999d4d883a90293ba2 +size 10908544 diff --git a/measurements/data/Pixel3/path20/17037535703892.csv b/measurements/data/Pixel3/path20/17037535703892.csv new file mode 100644 index 0000000..5491829 --- /dev/null +++ b/measurements/data/Pixel3/path20/17037535703892.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23a5f83c1ff3fd0253818be6f3ce270c4c0a6b936b18761f9bb0ba9632bc7974 +size 10478599 diff --git a/measurements/data/Pixel3/path21/15786943753685.csv b/measurements/data/Pixel3/path21/15786943753685.csv new file mode 100644 index 0000000..7a1545e --- /dev/null +++ b/measurements/data/Pixel3/path21/15786943753685.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27da11e082415213baa943a92266e9ac3627c29d8be58ebbb55c473e26b80bcc +size 16057001 diff --git a/measurements/data/Pixel3/path21/16075928276171.csv b/measurements/data/Pixel3/path21/16075928276171.csv new file mode 100644 index 0000000..ecb33b9 --- /dev/null +++ b/measurements/data/Pixel3/path21/16075928276171.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa1e2f309e1d0d9a396a999cf0569fa498ea5e896f49f083fc81781e5663654 +size 18694562 diff --git a/measurements/data/Pixel3/path21/16268193326887.csv b/measurements/data/Pixel3/path21/16268193326887.csv new file mode 100644 index 0000000..31372f5 --- /dev/null +++ b/measurements/data/Pixel3/path21/16268193326887.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87178db08bbfebf9a932ae5ddface06d45fe58e790ca15fd4f2bd6ae972feac9 +size 15604208 diff --git a/measurements/data/Pixel3/path21/16424251083631.csv b/measurements/data/Pixel3/path21/16424251083631.csv new file mode 100644 index 0000000..4d736c7 --- /dev/null +++ b/measurements/data/Pixel3/path21/16424251083631.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb7dee5bff86916d0706aa459c546fae04cd0ab09a2ef2040f7d459396325f17 +size 15732613 diff --git a/measurements/data/Pixel3/path22/19916193051892.csv b/measurements/data/Pixel3/path22/19916193051892.csv new file mode 100644 index 0000000..13d9c42 --- /dev/null +++ b/measurements/data/Pixel3/path22/19916193051892.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b19b902b33c621dcc1bf588dd00e6faa56b7a9d790945d4b1a6dc992446aeaf +size 12536377 diff --git a/measurements/data/Pixel3/path22/20083784919629.csv b/measurements/data/Pixel3/path22/20083784919629.csv new file mode 100644 index 0000000..8f07226 --- /dev/null +++ b/measurements/data/Pixel3/path22/20083784919629.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c223d7d2313ce193b470c40fc90d57fcb7a8cdba55611d0fd270b808f141365 +size 15850074 diff --git a/measurements/data/Pixel3/path22/20307809441061.csv b/measurements/data/Pixel3/path22/20307809441061.csv new file mode 100644 index 0000000..75099f1 --- /dev/null +++ b/measurements/data/Pixel3/path22/20307809441061.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1b56e8f4d65e92169816c9de7035b651b6faaf8b85f29cb70d515bbf2fac847 +size 11344237 diff --git a/measurements/data/Pixel3/path22/20475021182927.csv b/measurements/data/Pixel3/path22/20475021182927.csv new file mode 100644 index 0000000..352bf94 --- /dev/null +++ b/measurements/data/Pixel3/path22/20475021182927.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6575faf886a450ca3414af063aaaa27633149c130095e5a8f18bedf951acb1 +size 12547333 diff --git a/measurements/data/Readme.txt b/measurements/data/Readme.txt new file mode 100644 index 0000000..304ed9b --- /dev/null +++ b/measurements/data/Readme.txt @@ -0,0 +1,20 @@ +Mi, 13.11.2019 + +Path 10 & Path 11 +shl_nuc_2.xml +Path 10 I gelaufen im I Gebäude (GT Punkt 100 - 104 und zurück) +Path 11 L gelaufen im I Gebäude (GT Punkt 100 - 105 und zurück) + +Jeweils zweimal mit Pixel 2 und 3. +Gen7 NUCs wurden verwendet. +NUC 6-8 interne Antenne. +NUC 5 2dbi Antenne. +NUC 1 2dbi Antenne + +Bei Pixel 2 war die Tür zu Balzer Lab offen, bei P3 nicht. + + + +Path20: 8 NUCs Langes I 2x Toni 2x Markus +Path21: 8 NUCs L 2x Toni 2x Markus +Path22: 8 NUCs Komplexer Pfad von Balzer zu Deinzer zu Pool Raum und raus 2x Toni 2x Markus \ No newline at end of file