kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

added opertaor << and fix remove calibration

Browse Source
This commit is contained in:
kleiax
2023-05-25 17:10:42 +02:00
parent 49e0c2d1ef
commit b9be10e063
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/calibrateCompass/calibrateCompass.cpp
+21 -5
View File
@@ -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;
}