diff --git a/lib/calibrateCompass/calibrateCompass.cpp b/lib/calibrateCompass/calibrateCompass.cpp index d0ddd10..a90f453 100644 --- a/lib/calibrateCompass/calibrateCompass.cpp +++ b/lib/calibrateCompass/calibrateCompass.cpp @@ -73,14 +73,11 @@ void CalibrateCompass::start() { this->clearData(); this->state = State::Calibrating; - this->compass->setCalibration(0, 0, 0, 0, 0, 0); + this->compass->removeCalibration(); this->lastChange = millis(); } void CalibrateCompass::useData() { - if (this->state != State::Finished) - return; - this->compass->setCalibration( this->data.data[0][0], this->data.data[0][1], this->data.data[1][0], @@ -88,11 +85,13 @@ void CalibrateCompass::useData() { this->data.data[2][0], this->data.data[2][1] ); + + std::cout << "CalibrateCompass::useData " << *this << std::endl; } void CalibrateCompass::resetData() { this->reset(); - this->compass->setCalibration(0, 0, 0, 0, 0, 0); + this->compass->removeCalibration(); } void CalibrateCompass::reset() { @@ -137,3 +136,20 @@ void CalibrateCompass::clearData() { this->data.data[i][1] = 0; } } + +std::ostream& operator<<(std::ostream& os, const CalibrateCompass& caliComp) { + os << "("; + os << caliComp.data.data[0][0]; + os << ", "; + os << caliComp.data.data[0][1]; + os << ", "; + os << caliComp.data.data[1][0]; + os << ", "; + os << caliComp.data.data[1][1]; + os << ", "; + os << caliComp.data.data[2][0]; + os << ", "; + os << caliComp.data.data[2][1]; + os << ")"; + return os; +} diff --git a/lib/calibrateCompass/calibrateCompass.h b/lib/calibrateCompass/calibrateCompass.h index 4483a79..4f726fe 100644 --- a/lib/calibrateCompass/calibrateCompass.h +++ b/lib/calibrateCompass/calibrateCompass.h @@ -13,6 +13,7 @@ #include #include +#include class CalibrateCompass { public: @@ -39,6 +40,8 @@ class CalibrateCompass { State getState() const { return this->state; } CallibrationData getCallibrationData() const { return this->data; } + friend std::ostream& operator<<(std::ostream& os, const CalibrateCompass& caliComp); + private: QMC5883LCompass* compass; State state;