diff --git a/ipin/StepLoggerWrapperAndroid.h b/ipin/StepLoggerWrapperAndroid.h index 9ae48ab..a72fc63 100644 --- a/ipin/StepLoggerWrapperAndroid.h +++ b/ipin/StepLoggerWrapperAndroid.h @@ -50,7 +50,7 @@ private: #ifdef ANDROID //Log::add("SLWA", "calling android with lon/lat/floor"); - int res = QAndroidJniObject::callStaticMethod("indoor/java/StepLoggerClient", "log", "(DDD)I", x, y, z); + int res = QAndroidJniObject::callStaticMethod("indoor/java/StepLoggerClient", "log", "(DDD)I", x, y, std::round(z)); //if (res != 1337) {throw Exception("invalid return code while sending the current position to StepLogger.\nService Down?");} #endif diff --git a/nav/Filter.h b/nav/Filter.h index dcc8080..9f8784b 100644 --- a/nav/Filter.h +++ b/nav/Filter.h @@ -205,7 +205,7 @@ public: const WiFiMeasurements wifiObs = vg.group(_observation.wifi); const int numAP2 = wifiObs.entries.size(); - Log::add("Filter", "VAP: " + std::to_string(numAP1) + " -> " + std::to_string(numAP2)); + //Log::add("Filter", "VAP: " + std::to_string(numAP1) + " -> " + std::to_string(numAP2)); // sanity check Assert::equal((int)particles.size(), Settings::numParticles, "number of particles does not match the settings!"); diff --git a/nav/NavController.h b/nav/NavController.h index 477d9bf..32327ce 100644 --- a/nav/NavController.h +++ b/nav/NavController.h @@ -288,7 +288,7 @@ private: const Timestamp tsDiff = ts2-ts1; const QString filterTime = QString::number(tsDiff.ms()); avgSum += tsDiff.ms(); ++avgCount; - Log::add("xxx", "ts:" + std::to_string(curObs.currentTime.ms()) + " avg:" + std::to_string(avgSum/avgCount)); + //Log::add("xxx", "ts:" + std::to_string(curObs.currentTime.ms()) + " avg:" + std::to_string(avgSum/avgCount)); QMetaObject::invokeMethod(mainController->getInfoWidget(), "showFilterTime", Qt::QueuedConnection, Q_ARG(const QString&, filterTime)); return true; @@ -309,7 +309,7 @@ private: //lastEst = curEst; curEst = pf->update(&curCtrl, curObs); - Log::add("Nav", "cur est: " + curEst.position.asString()); + //Log::add("Nav", "cur est: " + curEst.position.asString()); // inform listeners about the new estimation for (NavControllerListener* l : listeners) {l->onNewEstimation(curEst.position.inMeter());} diff --git a/sensors/StepSensor.h b/sensors/StepSensor.h index 08ce035..11e6858 100644 --- a/sensors/StepSensor.h +++ b/sensors/StepSensor.h @@ -4,6 +4,7 @@ #include #include "AccelerometerSensor.h" +#include struct StepData { const int stepsSinceLastEvent = 0; @@ -45,6 +46,7 @@ public: const bool step = sd.add(ts, data); if (step) { informListeners(ts, StepData(1)); + Log::add("Step", "Step Detected!" + std::to_string(ts.ms())); } }