Skip to content

armgit / flix

Public Imported from GitHub
0

Making an ESP32-based quadcopter from scratch

Various minor fixes

Oleg Kalachev299c8a6a0241
diff --git a/docs/book/SUMMARY.md b/docs/book/SUMMARY.md
index b990112..e0280ab 100644
--- a/docs/book/SUMMARY.md
+++ b/docs/book/SUMMARY.md
@@ -12,7 +12,7 @@
* [Моторы]()
* [Радиоуправление]()
* [Гироскоп](gyro.md)
-* [Акселерометр]()s
+* [Акселерометр]()
* [Оценка состояния]()
* [PID-регулятор]()
* [Режим ACRO]()
diff --git a/flix/rc.ino b/flix/rc.ino
index e570f5f..2d10420 100644
--- a/flix/rc.ino
+++ b/flix/rc.ino
@@ -32,14 +32,14 @@ void normalizeRC() {
}
void calibrateRC() {
- Serial.println("Calibrate RC: move all sticks to maximum positions within 4 seconds");
+ Serial.println("Calibrate RC: move all sticks to maximum positions in 4 seconds");
Serial.println("··o ··o\n··· ···\n··· ···");
delay(4000);
for (int i = 0; i < 30; i++) readRC(); // ensure the values are updated
for (int i = 0; i < RC_CHANNELS; i++) {
channelMax[i] = channels[i];
}
- Serial.println("Calibrate RC: move all sticks to neutral positions within 4 seconds");
+ Serial.println("Calibrate RC: move all sticks to neutral positions in 4 seconds");
Serial.println("··· ···\n··· ·o·\n·o· ···");
delay(4000);
for (int i = 0; i < 30; i++) readRC(); // ensure the values are updated
diff --git a/flix/util.ino b/flix/util.ino
index b5373d1..3dc9259 100644
--- a/flix/util.ino
+++ b/flix/util.ino
@@ -28,12 +28,11 @@ float wrapAngle(float angle) {
template <typename T>
void printArray(T arr[], int size) {
- Serial.print("{");
for (uint8_t i = 0; i < size; i++) {
- Serial.print(arr[i]);
- if (i < size - 1) Serial.print(", ");
+ Serial.printf("%g", static_cast<float>(arr[i]));
+ if (i < size - 1) Serial.print(" ");
}
- Serial.println("}");
+ Serial.println();
}
// Disable reset on low voltage