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

Fixed file encoding

Browse Source
This commit is contained in:
Markus Bullmann
2019-09-18 10:52:37 +02:00
parent 51117d7559
commit e4054a9206
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/FtmKalman.h
View File

@@ -58,8 +58,8 @@ struct Kalman
0, square(processNoiseVelocity); 0, square(processNoiseVelocity);
// Prediction // Prediction
x = A * x; // Pr<EFBFBD>dizierter Zustand aus Bisherigem und System x = A * x; // Prädizierter Zustand aus Bisherigem und System
P = A * P*A.transpose()+Q; // Pr<EFBFBD>dizieren der Kovarianz P = A * P*A.transpose()+Q; // Prädizieren der Kovarianz
// Correction // Correction
float Z = measurment; float Z = measurment;

6
code/Settings.h
View File

@@ -167,7 +167,7 @@ namespace Settings {
{ 0, 1, 2, 3 } { 0, 1, 2, 3 }
}; };
// 1 Path: U von TR nach TD und zur<EFBFBD>ck; // 1 Path: U von TR nach TD und zurück;
const DataSetup Path1 = { const DataSetup Path1 = {
mapDir + "map2_ap_path1.xml", mapDir + "map2_ap_path1.xml",
{ {
@@ -228,7 +228,7 @@ namespace Settings {
{ 1, 2, 6, 7, 6, 2, 1, 2, 6, 7, 6, 2, 1 } { 1, 2, 6, 7, 6, 2, 1, 2, 6, 7, 6, 2, 1 }
}; };
// 4 Path: In R<EFBFBD>umen // 4 Path: In Räumen
const DataSetup Path4 = { const DataSetup Path4 = {
mapDir + "map2_ap_path2.xml", mapDir + "map2_ap_path2.xml",
{ {
@@ -249,7 +249,7 @@ namespace Settings {
}; };
// 5 Path: In R<EFBFBD>umen extendend // 5 Path: In Räumen extendend
const DataSetup Path5 = { const DataSetup Path5 = {
mapDir + "map2_ap_path2.xml", mapDir + "map2_ap_path2.xml",
{ {

2
code/filter.h
View File

@@ -315,7 +315,7 @@ public:
Point3 apPos = Settings::data.CurrentPath.NUCs.find(wifi.first)->second.position; Point3 apPos = Settings::data.CurrentPath.NUCs.find(wifi.first)->second.position;
Point3 particlePos = p.state.pos.pos; Point3 particlePos = p.state.pos.pos;
particlePos.z = 1.3; // smartphone h<EFBFBD>he particlePos.z = 1.3; // smartphone höhe
float apDist = particlePos.getDistance(apPos); float apDist = particlePos.getDistance(apPos);
if (Settings::UseKalman) if (Settings::UseKalman)