Skip to content

armgit / flix

Public Imported from GitHub
0

Making an ESP32-based quadcopter from scratch

Rename printIMUCal to printIMUCalibration for consistency with rc

Oleg Kalachev6b38070e43aa
diff --git a/flix/cli.ino b/flix/cli.ino
index afc602f..4b7039a 100644
--- a/flix/cli.ino
+++ b/flix/cli.ino
@@ -106,7 +106,7 @@ void doCommand(String str, bool echo = false) {
printIMUInfo();
print("gyro: %f %f %f\n", rates.x, rates.y, rates.z);
print("acc: %f %f %f\n", acc.x, acc.y, acc.z);
- printIMUCal();
+ printIMUCalibration();
print("rate: %.0f\n", loopRate);
print("landed: %d\n", landed);
} else if (command == "rc") {
diff --git a/flix/imu.ino b/flix/imu.ino
index 42b3793..248bd9e 100644
--- a/flix/imu.ino
+++ b/flix/imu.ino
@@ -80,7 +80,7 @@ void calibrateAccel() {
pause(8);
calibrateAccelOnce();
- printIMUCal();
+ printIMUCalibration();
print("✓ Calibration done!\n");
configureIMU();
}
@@ -112,7 +112,7 @@ void calibrateAccelOnce() {
accBias = (accMax + accMin) / 2;
}
-void printIMUCal() {
+void printIMUCalibration() {
print("gyro bias: %f %f %f\n", gyroBias.x, gyroBias.y, gyroBias.z);
print("accel bias: %f %f %f\n", accBias.x, accBias.y, accBias.z);
print("accel scale: %f %f %f\n", accScale.x, accScale.y, accScale.z);
diff --git a/gazebo/flix.h b/gazebo/flix.h
index 2891303..53da2b3 100644
--- a/gazebo/flix.h
+++ b/gazebo/flix.h
@@ -69,6 +69,6 @@ void resetParameters();
void setLED(bool on) {};
void calibrateGyro() { print("Skip gyro calibrating\n"); };
void calibrateAccel() { print("Skip accel calibrating\n"); };
-void printIMUCal() { print("cal: N/A\n"); };
+void printIMUCalibration() { print("cal: N/A\n"); };
void printIMUInfo() {};
Vector accBias, gyroBias, accScale(1, 1, 1);