mirror of
https://github.com/okalachev/flix.git
synced 2026-08-16 00:38:56 +00:00
Compare commits
54
Commits
master
..
f355cc2938
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f355cc2938 | ||
|
|
0139d71b12 | ||
|
|
58da0b9959 | ||
|
|
355f4ad49d | ||
|
|
55398a660d | ||
|
|
63bbea4d8b | ||
|
|
5543a363b3 | ||
|
|
363c756c00 | ||
|
|
57b853361c | ||
|
|
ce37e5b724 | ||
|
|
36b050a896 | ||
|
|
93ebf75a44 | ||
|
|
a60c84ce7a | ||
|
|
ae8931cb25 | ||
|
|
e6072b0bc4 | ||
|
|
67e772a23f | ||
|
|
04a24c4939 | ||
|
|
f62e176313 | ||
|
|
8ae06eef85 | ||
|
|
9a17ca848d | ||
|
|
b8f93becca | ||
|
|
5fc2143994 | ||
|
|
b7102d395c | ||
|
|
58ea75d335 | ||
|
|
93b3077fa7 | ||
|
|
4c74768131 | ||
|
|
9880eeccd3 | ||
|
|
a26d096dc0 | ||
|
|
8a91201cf4 | ||
|
|
51ca049b97 | ||
|
|
2decd2d6dd | ||
|
|
abb2e9f79b | ||
|
|
6c907b77f6 | ||
|
|
0a53170097 | ||
|
|
6b36488245 | ||
|
|
f30a182b20 | ||
|
|
90b506e084 | ||
|
|
5f9aae62b9 | ||
|
|
0e0867ceab | ||
|
|
83aac78cf7 | ||
|
|
eb93b0b29d | ||
|
|
9289b042af | ||
|
|
1203a3ae8f | ||
|
|
d48b71fb1a | ||
|
|
0439407d76 | ||
|
|
c2005a2ca2 | ||
|
|
6a804862da | ||
|
|
590bfe10b0 | ||
|
|
70af1a1c09 | ||
|
|
9e9dafbdfb | ||
|
|
86a4418813 | ||
|
|
7c53e88963 | ||
|
|
28f015569b | ||
|
|
83d1c5c68a |
@@ -13,7 +13,7 @@ jobs:
|
||||
env:
|
||||
ARDUINO_SKETCH_ALWAYS_EXPORT_BINARIES: 1
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Arduino CLI
|
||||
run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
|
||||
- name: Build firmware for ESP32
|
||||
@@ -27,9 +27,9 @@ jobs:
|
||||
- name: Build firmware for ESP32-S3 with OPI PSRAM
|
||||
run: make BOARD=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=opi EXTRA=--output-dir=flix/build/esp32.esp32.esp32s3.opi
|
||||
- name: Build firmware for Flix2
|
||||
run: make BOARD=esp32:esp32:esp32s3:FlashSize=4M,CDCOnBoot=cdc,PSRAM=opi EXTRA='--build-property "compiler.cpp.extra_flags=-DFLIX2" --output-dir=flix/build/esp32.esp32.flix2'
|
||||
run: make BOARD=esp32:esp32:esp32s3:FlashSize=4M,CDCOnBoot=cdc,PSRAM=opi FLAGS=-DFLIX2 EXTRA=--output-dir=flix/build/esp32.esp32.flix2
|
||||
- name: Upload binaries
|
||||
uses: actions/upload-artifact@v7
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: firmware-binary
|
||||
path: flix/build
|
||||
@@ -41,7 +41,7 @@ jobs:
|
||||
build_macos:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Arduino CLI
|
||||
run: brew install arduino-cli
|
||||
- name: Build firmware
|
||||
@@ -52,7 +52,7 @@ jobs:
|
||||
build_windows:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Arduino CLI
|
||||
run: choco install arduino-cli
|
||||
- name: Install Make
|
||||
@@ -73,7 +73,7 @@ jobs:
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y curl wget build-essential cmake g++ pkg-config gnupg2 lsb-release sudo
|
||||
- name: Install Arduino CLI
|
||||
run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Gazebo
|
||||
run: |
|
||||
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
|
||||
@@ -84,16 +84,7 @@ jobs:
|
||||
run: sudo apt-get install -y libsdl2-dev
|
||||
- name: Build simulator
|
||||
run: make build_simulator
|
||||
- name: Run simulator
|
||||
env:
|
||||
GAZEBO_MODEL_PATH: ${{ github.workspace }}/gazebo/models
|
||||
GAZEBO_PLUGIN_PATH: ${{ github.workspace }}/gazebo/build
|
||||
run: |
|
||||
OUT=$(timeout -k 10s 120s gzserver --verbose gazebo/flix.world 2>&1 | tee /dev/stderr)
|
||||
if echo "$OUT" | grep -Pq "\[Err\](?! \[RenderEngine)"; then
|
||||
exit 1
|
||||
fi
|
||||
- uses: actions/upload-artifact@v7
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: gazebo-plugin-binary
|
||||
path: gazebo/build/*.so
|
||||
@@ -105,7 +96,7 @@ jobs:
|
||||
steps:
|
||||
- name: Install Arduino CLI
|
||||
run: brew install arduino-cli
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Clean up python binaries # Workaround for https://github.com/actions/setup-python/issues/577
|
||||
run: |
|
||||
rm -f /usr/local/bin/2to3*
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
markdownlint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install markdownlint
|
||||
run: npm install -g markdownlint-cli2
|
||||
- name: Run markdownlint
|
||||
@@ -28,7 +28,7 @@ jobs:
|
||||
env:
|
||||
BINARIES: ${{ github.event_name == 'push' && (github.ref_name == 'master' || github.ref_name == 'dev') && github.repository == 'okalachev/flix' }}
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install mdBook
|
||||
run: cargo install mdbook --vers 0.4.43 --locked
|
||||
- name: Build book
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Download firmware binaries
|
||||
if: ${{ env.BINARIES }}
|
||||
uses: actions/download-artifact@v7
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
repository: ${{ github.repository }}
|
||||
@@ -70,12 +70,12 @@ jobs:
|
||||
ln -s "$FQBN/flix.ino.bootloader.bin" "flix.$BOARD.bootloader.bin"
|
||||
done
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-pages-artifact@v5
|
||||
uses: actions/upload-pages-artifact@v3
|
||||
with:
|
||||
path: docs/build
|
||||
|
||||
deploy:
|
||||
if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
|
||||
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
||||
concurrency:
|
||||
group: "pages"
|
||||
cancel-in-progress: true
|
||||
@@ -87,4 +87,4 @@ jobs:
|
||||
steps:
|
||||
- name: Deploy to GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v5
|
||||
uses: actions/deploy-pages@v4
|
||||
|
||||
@@ -10,7 +10,7 @@ jobs:
|
||||
csv_to_ulog:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build csv_to_ulog
|
||||
run: cd tools/csv_to_ulog && mkdir build && cd build && cmake .. && make
|
||||
- name: Test csv_to_ulog
|
||||
@@ -22,13 +22,13 @@ jobs:
|
||||
pyflix:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Python build tools
|
||||
run: pip install build
|
||||
- name: Build pyflix
|
||||
run: python3 -m build tools
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v7
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: pyflix
|
||||
path: |
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
python_tools:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Python dependencies
|
||||
run: pip install -r tools/requirements.txt
|
||||
- name: Test csv_to_mcap tool
|
||||
@@ -46,23 +46,3 @@ jobs:
|
||||
echo -e "t,x,y,z\n0,1,2,3\n1,4,5,6" > log.csv
|
||||
./csv_to_mcap.py log.csv
|
||||
test $(stat -c %s log.mcap) -eq 883
|
||||
sloc:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- run: sudo apt-get install -y cloc jq
|
||||
- name: Print source lines of code
|
||||
run: cloc --by-file-by-lang flix
|
||||
- name: Checkout previous revision
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
|
||||
path: prev
|
||||
- name: Annotate total source lines
|
||||
run: |
|
||||
SLOC_CURR=$(cloc flix --json | jq -r '.SUM.code')
|
||||
SLOC_PREV=$(cloc prev/flix --json | jq -r '.SUM.code')
|
||||
DIFF=$(printf '%+d' "$((SLOC_CURR - SLOC_PREV))")
|
||||
echo "* Current SLOC: $SLOC_CURR" >> $GITHUB_STEP_SUMMARY
|
||||
echo "* Previous SLOC: $SLOC_PREV" >> $GITHUB_STEP_SUMMARY
|
||||
echo "* Diff: $DIFF" >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
BOARD = esp32:esp32:esp32
|
||||
PORT := $(strip $(wildcard /dev/serial/by-id/usb-Silicon_Labs_CP21* /dev/serial/by-id/usb-1a86_USB_Single_Serial_* /dev/cu.usbserial-* /dev/cu.usbmodem*))
|
||||
VERSION = $(shell git describe --always --dirty)
|
||||
|
||||
export ARDUINO_NETWORK_CONNECTION_TIMEOUT := 1h
|
||||
|
||||
build: .core .libs
|
||||
arduino-cli compile flix --fqbn $(BOARD) --build-property "build.core_debug_level=1" $(EXTRA)
|
||||
arduino-cli compile flix \
|
||||
--fqbn $(BOARD) \
|
||||
--build-property "build.core_debug_level=1" \
|
||||
--build-property "compiler.cpp.extra_flags=-DVERSION=$(VERSION) $(FLAGS)" $(EXTRA)
|
||||
|
||||
upload: build
|
||||
arduino-cli upload flix --fqbn $(BOARD) -p "$(PORT)"
|
||||
@@ -22,7 +26,7 @@ core .core:
|
||||
|
||||
libs .libs:
|
||||
arduino-cli lib update-index
|
||||
arduino-cli lib install "FlixPeriph"
|
||||
ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=1 arduino-cli lib install --git-url 'https://github.com/okalachev/flixperiph.git#dev'
|
||||
arduino-cli lib install "MAVLink"@2.0.25
|
||||
touch .libs
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
* [`vector.h`](https://github.com/okalachev/flix/blob/master/flix/vector.h), [`quaternion.h`](https://github.com/okalachev/flix/blob/master/flix/quaternion.h) — библиотеки векторов и кватернионов.
|
||||
* [`pid.h`](https://github.com/okalachev/flix/blob/master/flix/pid.h) — ПИД-регулятор.
|
||||
* [`filter.h`](https://github.com/okalachev/flix/blob/master/flix/filter.h) — фильтр нижних частот.
|
||||
* [`lpf.h`](https://github.com/okalachev/flix/blob/master/flix/lpf.h) — фильтр нижних частот.
|
||||
|
||||
### Подсистема управления
|
||||
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ Utility files:
|
||||
|
||||
* [`vector.h`](../flix/vector.h), [`quaternion.h`](../flix/quaternion.h) — vector and quaternion libraries.
|
||||
* [`pid.h`](../flix/pid.h) — generic PID controller.
|
||||
* [`filter.h`](../flix/filter.h) — generic low-pass filter.
|
||||
* [`lpf.h`](../flix/lpf.h) — generic low-pass filter.
|
||||
|
||||
### Control subsystem
|
||||
|
||||
|
||||
+24
-4
@@ -50,8 +50,14 @@ const char* motd =
|
||||
"sta <ssid> <password> - configure Wi-Fi client mode\n"
|
||||
"espnow <mac> [<key>] - configure ESP-NOW peer\n"
|
||||
"mot - show motor output\n"
|
||||
"log [dump] - print log header [and data]\n"
|
||||
"mfr/mfl/mrr/mrl [<thrust>] - test motor (remove props)\n"
|
||||
"log [dump] - print log header [and data]\n"
|
||||
"log - show log info\n"
|
||||
"log header - show log header\n"
|
||||
"log reset - reset log\n"
|
||||
"log <name> <rate> - setup log topic rate\n"
|
||||
"l <str> - show log values starting with str\n"
|
||||
"l expose <name> - expose log value to telemetry\n"
|
||||
"sys - show system info\n"
|
||||
"reset - reset drone's state\n"
|
||||
"reboot - reboot the drone\n";
|
||||
@@ -153,9 +159,18 @@ void doCommand(String str, bool echo = false) {
|
||||
} else if (command == "mot") {
|
||||
print("front-right %g front-left %g rear-right %g rear-left %g\n",
|
||||
motors[MOTOR_FRONT_RIGHT], motors[MOTOR_FRONT_LEFT], motors[MOTOR_REAR_RIGHT], motors[MOTOR_REAR_LEFT]);
|
||||
} else if (command == "log") {
|
||||
} else if (command == "log" && arg0 == "") {
|
||||
printLogInfo();
|
||||
} else if (command == "log" && arg1 != "") {
|
||||
configLogThrottle(arg0.c_str(), arg1.toFloat());
|
||||
} else if (command == "log" && arg0 == "header") {
|
||||
printLogHeader();
|
||||
if (arg0 == "dump") printLogData();
|
||||
} else if (command == "log" && arg0 == "reset") {
|
||||
resetLog();
|
||||
} else if (command == "l" && arg0 == "expose" && arg1 != "") {
|
||||
exposeLogValue(arg1.c_str());
|
||||
} else if (command == "l") {
|
||||
printLogValues(arg0.c_str());
|
||||
} else if (command == "cr") {
|
||||
calibrateRC();
|
||||
} else if (command == "ca") {
|
||||
@@ -174,7 +189,12 @@ void doCommand(String str, bool echo = false) {
|
||||
print("Temperature: %.1f °C\n", temperatureRead());
|
||||
print("Total RAM: %d KB\n", ESP.getHeapSize() / 1024);
|
||||
print("Free heap: %d KB\n", ESP.getFreeHeap() / 1024);
|
||||
print("Firmware: " __DATE__ " " __TIME__ "\n");
|
||||
print("PSRAM: %d KB\n", ESP.getPsramSize() / 1024);
|
||||
print("Free PSRAM: %d KB\n", ESP.getFreePsram() / 1024);
|
||||
#ifdef VERSION
|
||||
print("Version: %s\n", STRINGIFY(VERSION));
|
||||
#endif
|
||||
print("Build date: " __DATE__ " " __TIME__ "\n");
|
||||
// Print tasks table
|
||||
print("Num Task MinSt Prio Core CPU%%\n");
|
||||
int taskCount = uxTaskGetNumberOfTasks();
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ bool armed = false;
|
||||
Quaternion attitudeTarget;
|
||||
Vector ratesTarget;
|
||||
Vector ratesExtra; // feedforward rates
|
||||
Vector torqueTarget;
|
||||
Vector torqueTarget; // 0 - no torque, 1 - maximum torque
|
||||
float thrustTarget;
|
||||
|
||||
PID rollRatePID(0.05, 0.2, 0.001, 0.3, 0.2);
|
||||
|
||||
@@ -15,6 +15,12 @@ bool landed;
|
||||
float accWeight = 0.003;
|
||||
float levelWeight = 0.0002;
|
||||
LowPassFilter<Vector> ratesFilter(0.2); // cutoff frequency ~ 40 Hz
|
||||
NotchFilter<Vector> ratesNotch(382, 40);
|
||||
|
||||
void setupEstimate() {
|
||||
print("Setup estimation\n");
|
||||
ratesNotch.reset();
|
||||
}
|
||||
|
||||
void estimate() {
|
||||
applyGyro();
|
||||
@@ -25,6 +31,7 @@ void estimate() {
|
||||
void applyGyro() {
|
||||
// filter gyro to get angular rates
|
||||
rates = ratesFilter.update(gyro);
|
||||
rates = ratesNotch.update(rates);
|
||||
|
||||
// apply rates to attitude
|
||||
attitude = Quaternion::rotate(attitude, Quaternion::fromRotationVector(rates * dt));
|
||||
|
||||
+65
-1
@@ -1,7 +1,7 @@
|
||||
// Copyright (c) 2023 Oleg Kalachev <okalachev@gmail.com>
|
||||
// Repository: https://github.com/okalachev/flix
|
||||
|
||||
// Low pass filter implementation
|
||||
// Low pass and notch filters
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -32,3 +32,67 @@ public:
|
||||
private:
|
||||
bool init = false;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
class NotchFilter {
|
||||
public:
|
||||
float frequency;
|
||||
float bandwidth;
|
||||
T output;
|
||||
|
||||
NotchFilter(float frequency, float bandwidth): frequency(frequency), bandwidth(bandwidth) {
|
||||
reset();
|
||||
};
|
||||
|
||||
T update(const T input) {
|
||||
if (frequency <= 0 || bandwidth <= 0) return input;
|
||||
|
||||
if (!init) {
|
||||
init = true;
|
||||
x1 = x2 = input;
|
||||
y1 = y2 = input;
|
||||
return output = input;
|
||||
}
|
||||
|
||||
output = b0 * input + b1 * x1 + b2 * x2 - a1 * y1 - a2 * y2;
|
||||
|
||||
x2 = x1;
|
||||
x1 = input;
|
||||
y2 = y1;
|
||||
y1 = output;
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
void reset() {
|
||||
const float dt = 0.001f;
|
||||
float f = frequency;
|
||||
float bw = bandwidth;
|
||||
if (f < 0) f = 0;
|
||||
if (bw < 1e-6f) bw = 1e-6f;
|
||||
|
||||
float q = f / bw;
|
||||
if (q < 1e-3f) q = 1e-3f;
|
||||
|
||||
const float w0 = 2.0f * PI * f * dt;
|
||||
const float c = cos(w0);
|
||||
const float s = sin(w0);
|
||||
const float alpha = s / (2.0f * q);
|
||||
|
||||
const float a0 = 1.0f + alpha;
|
||||
const float invA0 = 1.0f / a0;
|
||||
|
||||
b0 = 1.0f * invA0;
|
||||
b1 = -2.0f * c * invA0;
|
||||
b2 = 1.0f * invA0;
|
||||
a1 = -2.0f * c * invA0;
|
||||
a2 = (1.0f - alpha) * invA0;
|
||||
|
||||
init = false;
|
||||
}
|
||||
|
||||
private:
|
||||
float b0, b1, b2, a1, a2;
|
||||
T x1, x2, y1, y2;
|
||||
bool init = false;
|
||||
};
|
||||
|
||||
+3
-1
@@ -26,6 +26,8 @@ void setup() {
|
||||
setupWiFi();
|
||||
setupIMU();
|
||||
setupRC();
|
||||
setupEstimate();
|
||||
setupLog();
|
||||
setLED(false);
|
||||
print("Initializing complete\n");
|
||||
}
|
||||
@@ -40,6 +42,6 @@ void loop() {
|
||||
handleInput();
|
||||
processMavlink();
|
||||
readVoltage();
|
||||
logData();
|
||||
loopLog();
|
||||
syncParameters();
|
||||
}
|
||||
|
||||
+247
-52
@@ -1,77 +1,272 @@
|
||||
// Copyright (c) 2023 Oleg Kalachev <okalachev@gmail.com>
|
||||
// Repository: https://github.com/okalachev/flix
|
||||
|
||||
// In-RAM logging
|
||||
// Logging subsystem
|
||||
|
||||
#include "vector.h"
|
||||
#include "util.h"
|
||||
|
||||
#define LOG_RATE 100
|
||||
#define LOG_DURATION 10
|
||||
#define LOG_SIZE LOG_DURATION * LOG_RATE
|
||||
int logMemory = 0; // 0 - RAM, 1 - PSRAM, -1 - disabled
|
||||
float logUsage = 0.5; // fraction of free memory to use for log
|
||||
|
||||
Vector attitudeEuler;
|
||||
Vector attitudeTargetEuler;
|
||||
|
||||
struct LogEntry {
|
||||
struct LogValue {
|
||||
const char *name;
|
||||
float *value;
|
||||
Value value;
|
||||
float lastValue = NAN;
|
||||
bool logged = true; // if false, use only for triggering log update
|
||||
LogValue() : name(nullptr), value() {}; // empty value constructor
|
||||
template <typename T>
|
||||
LogValue(const char *name, T value, bool logged = true) : name(name), value(value), logged(logged) {};
|
||||
};
|
||||
|
||||
LogEntry logEntries[] = {
|
||||
{"t", &t},
|
||||
{"rates.x", &rates.x},
|
||||
{"rates.y", &rates.y},
|
||||
{"rates.z", &rates.z},
|
||||
{"ratesTarget.x", &ratesTarget.x},
|
||||
{"ratesTarget.y", &ratesTarget.y},
|
||||
{"ratesTarget.z", &ratesTarget.z},
|
||||
{"attitude.x", &attitudeEuler.x},
|
||||
{"attitude.y", &attitudeEuler.y},
|
||||
{"attitude.z", &attitudeEuler.z},
|
||||
{"attitudeTarget.x", &attitudeTargetEuler.x},
|
||||
{"attitudeTarget.y", &attitudeTargetEuler.y},
|
||||
{"attitudeTarget.z", &attitudeTargetEuler.z},
|
||||
{"thrustTarget", &thrustTarget}
|
||||
struct LogTopic {
|
||||
LogValue values[10];
|
||||
int length = 0; // number of logged values
|
||||
float throttle; // max update rate, Hz
|
||||
float lastUpdate = -INFINITY;
|
||||
|
||||
LogTopic(float throttle, LogValue v0, LogValue v1 = {}, LogValue v2 = {}, LogValue v3 = {}, LogValue v4 = {}, LogValue v5 = {}, LogValue v6 = {}, LogValue v7 = {}, LogValue v8 = {}, LogValue v9 = {}) :
|
||||
throttle(throttle), values{v0, v1, v2, v3, v4, v5, v6, v7, v8, v9} {
|
||||
// Count logged values
|
||||
for (auto& v : values) {
|
||||
if (v.name == nullptr) break;
|
||||
if (v.logged) length++;
|
||||
}
|
||||
};
|
||||
|
||||
LogTopic(LogValue v0, LogValue v1 = {}, LogValue v2 = {}, LogValue v3 = {}, LogValue v4 = {}, LogValue v5 = {}, LogValue v6 = {}, LogValue v7 = {}, LogValue v8 = {}, LogValue v9 = {}) :
|
||||
LogTopic(INFINITY, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9) {};
|
||||
};
|
||||
|
||||
const int logColumns = sizeof(logEntries) / sizeof(logEntries[0]);
|
||||
float logBuffer[LOG_SIZE][logColumns];
|
||||
LogTopic logTopics[] = {
|
||||
// time
|
||||
LogTopic({"t", &t}), // must be the first topic
|
||||
LogTopic(1, {"loopRate", &loopRate}),
|
||||
|
||||
void prepareLogData() {
|
||||
attitudeEuler = attitude.toEuler();
|
||||
attitudeTargetEuler = attitudeTarget.toEuler();
|
||||
}
|
||||
// imu
|
||||
LogTopic(
|
||||
{"gyro.x", &gyro.x},
|
||||
{"gyro.y", &gyro.y},
|
||||
{"gyro.z", &gyro.z}),
|
||||
|
||||
void logData() {
|
||||
if (!armed) return;
|
||||
static int logPointer = 0;
|
||||
static Rate period(LOG_RATE);
|
||||
if (!period) return;
|
||||
LogTopic(50,
|
||||
{"acc.x", &acc.x},
|
||||
{"acc.y", &acc.y},
|
||||
{"acc.z", &acc.z}),
|
||||
|
||||
prepareLogData();
|
||||
LogTopic(10,
|
||||
{"gyroBias.x", &gyroBias.x},
|
||||
{"gyroBias.y", &gyroBias.y},
|
||||
{"gyroBias.z", &gyroBias.z}),
|
||||
|
||||
for (int i = 0; i < logColumns; i++) {
|
||||
logBuffer[logPointer][i] = *logEntries[i].value;
|
||||
}
|
||||
// estimation
|
||||
LogTopic(50,
|
||||
{"rates.x", &rates.x},
|
||||
{"rates.y", &rates.y},
|
||||
{"rates.z", &rates.z},
|
||||
{"attitude.roll", []() { return attitude.getRoll(); }},
|
||||
{"attitude.pitch", []() { return attitude.getPitch(); }},
|
||||
{"attitude.yaw", []() { return attitude.getYaw(); }}),
|
||||
|
||||
logPointer++;
|
||||
if (logPointer >= LOG_SIZE) {
|
||||
logPointer = 0;
|
||||
// rc
|
||||
LogTopic(10,
|
||||
{"controlTime", &controlTime, false}, // trigger value
|
||||
{"controlRoll", &controlRoll},
|
||||
{"controlPitch", &controlPitch},
|
||||
{"controlYaw", &controlYaw},
|
||||
{"controlThrottle", &controlThrottle}),
|
||||
|
||||
// control
|
||||
LogTopic({"armed", &armed}),
|
||||
LogTopic({"mode", &mode}),
|
||||
|
||||
LogTopic(10,
|
||||
{"ratesTarget.x", &ratesTarget.x},
|
||||
{"ratesTarget.y", &ratesTarget.y},
|
||||
{"ratesTarget.z", &ratesTarget.z},
|
||||
{"attitudeTarget.roll", []() { return attitudeTarget.getRoll(); }},
|
||||
{"attitudeTarget.pitch", []() { return attitudeTarget.getPitch(); }},
|
||||
{"attitudeTarget.yaw", []() { return attitudeTarget.getYaw(); }},
|
||||
{"thrustTarget", &thrustTarget}),
|
||||
|
||||
// motors
|
||||
LogTopic(
|
||||
{"motors[0]", &motors[0]},
|
||||
{"motors[1]", &motors[1]},
|
||||
{"motors[2]", &motors[2]},
|
||||
{"motors[3]", &motors[3]}),
|
||||
|
||||
// misc
|
||||
LogTopic(5,
|
||||
{"voltage", &voltage},
|
||||
{"temp", &temperatureRead},
|
||||
{"imuTemp", []() { return imu->getTemp(); }}),
|
||||
};
|
||||
|
||||
void *logBuffer; // buffer for log data
|
||||
size_t logCapacity;
|
||||
size_t logCursor = 0;
|
||||
size_t logLength = 0;
|
||||
LogValue *logExposed = nullptr; // log values exposed to telemetry
|
||||
|
||||
void setupLog() {
|
||||
print("Setup log\n");
|
||||
|
||||
free(logBuffer); // when reconfiguring
|
||||
logBuffer = nullptr;
|
||||
logCursor = 0;
|
||||
logLength = 0;
|
||||
|
||||
if (logMemory == 0) {
|
||||
logCapacity = ESP.getFreeHeap() * logUsage;
|
||||
logBuffer = (uint8_t *)calloc(logCapacity, 1);
|
||||
} else if (logMemory == 1) {
|
||||
logCapacity = ESP.getFreePsram() * logUsage;
|
||||
logBuffer = (uint8_t *)heap_caps_calloc(logCapacity, 1, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
|
||||
}
|
||||
}
|
||||
|
||||
void printLogHeader() {
|
||||
for (int i = 0; i < logColumns; i++) {
|
||||
print("%s%s", logEntries[i].name, i < logColumns - 1 ? "," : "\n");
|
||||
}
|
||||
}
|
||||
void loopLog() {
|
||||
if (logBuffer == nullptr || !armed) return;
|
||||
|
||||
void printLogData() {
|
||||
for (int i = 0; i < LOG_SIZE; i++) {
|
||||
if (logBuffer[i][0] == 0) continue; // skip empty records
|
||||
for (int j = 0; j < logColumns; j++) {
|
||||
print("%g%s", logBuffer[i][j], j < logColumns - 1 ? "," : "\n");
|
||||
if (!logLength) resetLog(); // reset state on first log write
|
||||
|
||||
static Rate sync(2);
|
||||
if (sync) {
|
||||
const uint8_t marker[] = {0x1A, 0x91, 0x4F, 0xF6, 0x7F};
|
||||
writeLog(&marker, sizeof(marker)); // write sync marker
|
||||
}
|
||||
|
||||
for (uint8_t i = 0; i < sizeof(logTopics) / sizeof(logTopics[0]); i++) {
|
||||
LogTopic& topic = logTopics[i];
|
||||
if (t - topic.lastUpdate < 1 / topic.throttle) continue; // throttle topic
|
||||
if (!isTopicUpdated(i)) continue; // skip if topic was't updated
|
||||
|
||||
topic.lastUpdate = t;
|
||||
writeLog(&i, sizeof(i)); // write topic index
|
||||
|
||||
for (auto& value : topic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
if (!value.logged) continue;
|
||||
value.lastValue = value.value.get();
|
||||
writeLog(&value.lastValue, sizeof(float)); // write value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void resetLog() {
|
||||
for (auto& topic : logTopics) {
|
||||
topic.lastUpdate = -INFINITY;
|
||||
for (auto& value : topic.values) {
|
||||
value.lastValue = NAN;
|
||||
}
|
||||
}
|
||||
logCursor = 0;
|
||||
logLength = 0;
|
||||
}
|
||||
|
||||
void writeLog(const void *data, size_t size) {
|
||||
size_t first = min(size, logCapacity - logCursor);
|
||||
size_t second = size - first;
|
||||
memcpy(logBuffer + logCursor, data, first);
|
||||
logCursor = (logCursor + first) % logCapacity;
|
||||
if (second > 0) {
|
||||
memcpy(logBuffer + logCursor, data + first, second);
|
||||
logCursor = (logCursor + second) % logCapacity;
|
||||
}
|
||||
logLength = min(logLength + size, logCapacity);
|
||||
}
|
||||
|
||||
void readLog(void *data, size_t position, size_t size) {
|
||||
if (logLength == logCapacity) {
|
||||
position = (logCursor + position) % logCapacity;
|
||||
}
|
||||
size_t first = min(size, logCapacity - position);
|
||||
size_t second = size - first;
|
||||
memcpy(data, logBuffer + position, first);
|
||||
if (second > 0) {
|
||||
memcpy(data + first, logBuffer, second);
|
||||
}
|
||||
}
|
||||
|
||||
bool isTopicUpdated(const uint8_t topic) {
|
||||
LogTopic& logTopic = logTopics[topic];
|
||||
bool updated = false;
|
||||
|
||||
for (auto& value : logTopic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
float v = value.value.get();
|
||||
if (!floatEquals(value.lastValue, v)) {
|
||||
value.lastValue = v;
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
return updated;
|
||||
}
|
||||
|
||||
void printLogInfo() {
|
||||
if (logMemory == -1) return print("Log: disabled\n");
|
||||
|
||||
print("Memory: %s\n", logMemory == 0 ? "RAM" : "PSRAM");
|
||||
print("Usage: %.f%%\n", logUsage * 100);
|
||||
print("Capacity: %u bytes\n", (unsigned)logCapacity);
|
||||
print("Used: %u bytes\n", (unsigned)logLength);
|
||||
print("Estimated duration: %d seconds\n", estimateLogDuration());
|
||||
}
|
||||
|
||||
int estimateLogDuration() {
|
||||
float bandwidth = 0;
|
||||
for (LogTopic& topic : logTopics) {
|
||||
float rate = isinf(topic.throttle) ? loopRate : topic.throttle;
|
||||
bandwidth += rate * topic.length * sizeof(float);
|
||||
}
|
||||
return logCapacity / bandwidth;
|
||||
}
|
||||
|
||||
void printLogHeader() {
|
||||
int i = 0;
|
||||
for (auto& topic : logTopics) {
|
||||
print("Topic #%d (%g Hz):\n", i++, topic.throttle);
|
||||
for (auto& value : topic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
print(" %s%s\n", value.name, value.logged ?"" : " (not logged)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void printLogValues(const char *filter) {
|
||||
for (LogTopic& topic : logTopics) {
|
||||
for (LogValue& value : topic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
if (strncasecmp(value.name, filter, strlen(filter))) continue;
|
||||
print("%s = %g\n", value.name, value.value.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void configLogThrottle(const char *name, float throttle) {
|
||||
for (LogTopic& topic : logTopics) {
|
||||
for (LogValue& value : topic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
if (strcasecmp(value.name, name) != 0) continue;
|
||||
topic.throttle = throttle;
|
||||
print("Log throttle for %s set to %.1f Hz\n", name, throttle);
|
||||
return;
|
||||
}
|
||||
}
|
||||
print("Log value not found: %s\n", name);
|
||||
}
|
||||
|
||||
void exposeLogValue(const char *name) {
|
||||
for (int i = 0; i < sizeof(logTopics) / sizeof(logTopics[0]); i++) {
|
||||
LogTopic& topic = logTopics[i];
|
||||
for (LogValue& value : topic.values) {
|
||||
if (value.name == nullptr) break;
|
||||
if (strcasecmp(value.name, name) != 0) continue;
|
||||
logExposed = &value;
|
||||
print("Log value %s exposed\n", name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
print("Log value not found: %s\n", name);
|
||||
}
|
||||
|
||||
+61
-17
@@ -16,6 +16,7 @@ Rate telemetryAttitude(20);
|
||||
Rate telemetryRC(10);
|
||||
Rate telemetryMotors(10);
|
||||
Rate telemetryIMU(15);
|
||||
Rate telemetryTopic(10);
|
||||
|
||||
float mavlinkTime = NAN; // time of last received message
|
||||
String mavlinkPrintBuffer;
|
||||
@@ -84,6 +85,12 @@ void sendMavlink() {
|
||||
0, 0, 0, 0);
|
||||
sendMessage(&msg);
|
||||
}
|
||||
|
||||
if (telemetryTopic && logExposed != nullptr) {
|
||||
mavlink_msg_named_value_float_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &msg,
|
||||
time, logExposed->name, logExposed->value.get());
|
||||
sendMessage(&msg);
|
||||
}
|
||||
}
|
||||
|
||||
void sendMessage(const void *msg) {
|
||||
@@ -92,6 +99,26 @@ void sendMessage(const void *msg) {
|
||||
sendWiFi(buf, len);
|
||||
}
|
||||
|
||||
static uint8_t mavlinkBatch[ESP_NOW_MAX_DATA_LEN_V2];
|
||||
static int mavlinkBatchSize = 0;
|
||||
|
||||
void batchMessage(const void *msg) {
|
||||
uint8_t buf[MAVLINK_MAX_PACKET_LEN];
|
||||
int len = mavlink_msg_to_send_buffer(buf, (mavlink_message_t *)msg);
|
||||
|
||||
if (mavlinkBatchSize + len > sizeof(mavlinkBatch)) {
|
||||
sendWiFi(mavlinkBatch, mavlinkBatchSize);
|
||||
mavlinkBatchSize = 0;
|
||||
}
|
||||
memcpy(mavlinkBatch + mavlinkBatchSize, buf, len);
|
||||
mavlinkBatchSize += len;
|
||||
}
|
||||
|
||||
void flushBatchMessages() {
|
||||
sendWiFi(mavlinkBatch, mavlinkBatchSize);
|
||||
mavlinkBatchSize = 0;
|
||||
}
|
||||
|
||||
void receiveMavlink() {
|
||||
uint8_t buf[MAVLINK_MAX_PACKET_LEN];
|
||||
int len = receiveWiFi(buf, MAVLINK_MAX_PACKET_LEN);
|
||||
@@ -196,18 +223,24 @@ void handleMavlink(const void *_msg) {
|
||||
mavlink_msg_set_attitude_target_decode(&msg, &m);
|
||||
if (m.target_system && m.target_system != mavlinkSysId) return;
|
||||
|
||||
// copy attitude, rates and thrust targets
|
||||
ratesTarget.x = m.body_roll_rate;
|
||||
ratesTarget.y = -m.body_pitch_rate; // convert to flu
|
||||
ratesTarget.z = -m.body_yaw_rate;
|
||||
attitudeTarget.w = m.q[0];
|
||||
attitudeTarget.x = m.q[1];
|
||||
attitudeTarget.y = -m.q[2];
|
||||
attitudeTarget.z = -m.q[3];
|
||||
thrustTarget = m.thrust;
|
||||
ratesExtra = Vector(0, 0, 0);
|
||||
if (!(m.type_mask & ATTITUDE_TARGET_TYPEMASK_ATTITUDE_IGNORE)) {
|
||||
// Attitude control
|
||||
attitudeTarget.w = m.q[0];
|
||||
attitudeTarget.x = m.q[1];
|
||||
attitudeTarget.y = -m.q[2];
|
||||
attitudeTarget.z = -m.q[3];
|
||||
ratesExtra.x = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_ROLL_RATE_IGNORE ? 0 : m.body_roll_rate;
|
||||
ratesExtra.y = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_PITCH_RATE_IGNORE ? 0 : -m.body_pitch_rate; // convert to flu
|
||||
ratesExtra.z = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_YAW_RATE_IGNORE ? 0 : -m.body_yaw_rate;
|
||||
} else {
|
||||
// Rates control
|
||||
attitudeTarget.invalidate();
|
||||
ratesTarget.x = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_ROLL_RATE_IGNORE ? ratesTarget.x : m.body_roll_rate;
|
||||
ratesTarget.y = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_PITCH_RATE_IGNORE ? ratesTarget.y : -m.body_pitch_rate;
|
||||
ratesTarget.z = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_YAW_RATE_IGNORE ? ratesTarget.z : -m.body_yaw_rate;
|
||||
}
|
||||
|
||||
if (m.type_mask & ATTITUDE_TARGET_TYPEMASK_ATTITUDE_IGNORE) attitudeTarget.invalidate();
|
||||
thrustTarget = valid(m.thrust) ? m.thrust : thrustTarget;
|
||||
armed = m.thrust > 0;
|
||||
}
|
||||
|
||||
@@ -225,18 +258,29 @@ void handleMavlink(const void *_msg) {
|
||||
armed = motors[0] > 0 || motors[1] > 0 || motors[2] > 0 || motors[3] > 0;
|
||||
}
|
||||
|
||||
if (msg.msgid == MAVLINK_MSG_ID_LOG_REQUEST_LIST) {
|
||||
const uint32_t qgcEpoch = 1262304000; // qgc accepts only timestamps after 2010-01-01
|
||||
mavlink_message_t response;
|
||||
mavlink_msg_log_entry_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &response,
|
||||
0, 1, 0, qgcEpoch + t * 60, logLength); // put fake unique date to make qgc happy with saving logs
|
||||
sendMessage(&response);
|
||||
}
|
||||
|
||||
if (msg.msgid == MAVLINK_MSG_ID_LOG_REQUEST_DATA) {
|
||||
mavlink_log_request_data_t m;
|
||||
mavlink_msg_log_request_data_decode(&msg, &m);
|
||||
if (m.target_system && m.target_system != mavlinkSysId) return;
|
||||
|
||||
// Send all log records
|
||||
for (int i = 0; i < sizeof(logBuffer) / sizeof(logBuffer[0]); i++) {
|
||||
mavlink_message_t msg;
|
||||
mavlink_msg_log_data_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &msg, 0, i,
|
||||
sizeof(logBuffer[0]), (uint8_t *)logBuffer[i]);
|
||||
sendMessage(&msg);
|
||||
for (int i = 0; i < m.count; i += MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN) {
|
||||
int chunkSize = min(MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN, (int)(m.count - i));
|
||||
mavlink_message_t response;
|
||||
uint8_t data[MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN];
|
||||
readLog(data, m.ofs + i, chunkSize);
|
||||
mavlink_msg_log_data_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &response,
|
||||
m.id, m.ofs + i, chunkSize, data);
|
||||
batchMessage(&response);
|
||||
}
|
||||
flushBatchMessages();
|
||||
}
|
||||
|
||||
// Handle commands
|
||||
|
||||
+22
-4
@@ -22,7 +22,7 @@ struct Parameter {
|
||||
const char *name; // max length is 15
|
||||
bool integer;
|
||||
union { float *f; int *i; }; // pointer to the variable
|
||||
float initial; // default value
|
||||
float inital; // default value
|
||||
float cache; // what's stored in flash
|
||||
void (*callback)(); // called after parameter change
|
||||
Parameter(const char *name, float *variable, void (*callback)() = nullptr) : name(name), integer(false), f(variable), callback(callback) {};
|
||||
@@ -86,6 +86,8 @@ Parameter parameters[] = {
|
||||
{"EST_ACC_WEIGHT", &accWeight},
|
||||
{"EST_LVL_WEIGHT", &levelWeight},
|
||||
{"EST_RATES_LPF_A", &ratesFilter.alpha},
|
||||
{"EST_RATES_NF_F", &ratesNotch.frequency, setupEstimate},
|
||||
{"EST_RATES_NF_BW", &ratesNotch.bandwidth, setupEstimate},
|
||||
// motors
|
||||
{"MOT_PIN_FL", &motorPins[MOTOR_FRONT_LEFT], setupMotors},
|
||||
{"MOT_PIN_FR", &motorPins[MOTOR_FRONT_RIGHT], setupMotors},
|
||||
@@ -134,6 +136,22 @@ Parameter parameters[] = {
|
||||
{"MAV_RATE_RC", &telemetryRC.rate},
|
||||
{"MAV_RATE_MOT", &telemetryMotors.rate},
|
||||
{"MAV_RATE_IMU", &telemetryIMU.rate},
|
||||
{"MAV_RATE_TOPIC", &telemetryTopic.rate},
|
||||
// log
|
||||
{"LOG_MEMORY", &logMemory, setupLog},
|
||||
{"LOG_USAGE", &logUsage, setupLog},
|
||||
{"LOG_RATE_000", &logTopics[0].throttle},
|
||||
{"LOG_RATE_001", &logTopics[1].throttle},
|
||||
{"LOG_RATE_002", &logTopics[2].throttle},
|
||||
{"LOG_RATE_003", &logTopics[3].throttle},
|
||||
{"LOG_RATE_004", &logTopics[4].throttle},
|
||||
{"LOG_RATE_005", &logTopics[5].throttle},
|
||||
{"LOG_RATE_006", &logTopics[6].throttle},
|
||||
{"LOG_RATE_007", &logTopics[7].throttle},
|
||||
{"LOG_RATE_008", &logTopics[8].throttle},
|
||||
{"LOG_RATE_009", &logTopics[9].throttle},
|
||||
{"LOG_RATE_010", &logTopics[10].throttle},
|
||||
{"LOG_RATE_011", &logTopics[11].throttle},
|
||||
// power
|
||||
{"PWR_VOLT_PIN", &voltagePin, setupPower},
|
||||
{"PWR_VOLT_SCALE", &voltageScale},
|
||||
@@ -150,7 +168,7 @@ void setupParameters() {
|
||||
storage.begin("flix");
|
||||
// Read parameters from storage
|
||||
for (auto ¶meter : parameters) {
|
||||
parameter.initial = parameter.getValue();
|
||||
parameter.inital = parameter.getValue();
|
||||
if (storage.isKey(parameter.name)) {
|
||||
parameter.setValue(storage.getFloat(parameter.name));
|
||||
}
|
||||
@@ -211,10 +229,10 @@ void printParameters(const char *filter) {
|
||||
for (auto ¶meter : parameters) {
|
||||
if (strncasecmp(parameter.name, filter, strlen(filter))) continue;
|
||||
|
||||
if (floatEquals(parameter.getValue(), parameter.initial)) { // parameter changed
|
||||
if (floatEquals(parameter.getValue(), parameter.inital)) { // parameter changed
|
||||
print("%-15s %-13g\n", parameter.name, parameter.getValue());
|
||||
} else {
|
||||
print("%-15s %-13g [%g]\n", parameter.name, parameter.getValue(), parameter.initial);
|
||||
print("%-15s %-13g [%g]\n", parameter.name, parameter.getValue(), parameter.inital);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ public:
|
||||
|
||||
LowPassFilter<float> lpf; // low pass filter for derivative term
|
||||
|
||||
PID(float p, float i = 0, float d = 0, float windup = INFINITY, float dAlpha = 1, float dtMax = 0.1) :
|
||||
PID(float p, float i = 0, float d = 0, float windup = 0, float dAlpha = 1, float dtMax = 0.1) :
|
||||
p(p), i(i), d(d), windup(windup), lpf(dAlpha), dtMax(dtMax) {}
|
||||
|
||||
float update(float error) {
|
||||
|
||||
+45
@@ -11,6 +11,8 @@
|
||||
const float ONE_G = 9.80665;
|
||||
extern float t;
|
||||
|
||||
#define STRINGIFY(x) __STRINGIFY(x)
|
||||
|
||||
float mapf(float x, float in_min, float in_max, float out_min, float out_max) {
|
||||
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
|
||||
}
|
||||
@@ -64,6 +66,49 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
// Simple variant type for logging and parameters
|
||||
struct Value {
|
||||
enum { EMPTY, FLOAT, INT, BOOL, FLOAT_FN, INT_FN, BOOL_FN } type;
|
||||
union {
|
||||
void *pointer;
|
||||
float *_float;
|
||||
int *_int;
|
||||
bool *_bool;
|
||||
float (*floatFn)();
|
||||
int (*intFn)();
|
||||
bool (*boolFn)();
|
||||
};
|
||||
|
||||
Value() : type(EMPTY), pointer(nullptr) {};
|
||||
Value(float *pt) : type(FLOAT), _float(pt) {};
|
||||
Value(int *pt) : type(INT), _int(pt) {};
|
||||
Value(bool *pt) : type(BOOL), _bool(pt) {};
|
||||
Value(float (*fn)()) : type(FLOAT_FN), floatFn(fn) {};
|
||||
Value(int (*fn)()) : type(INT_FN), intFn(fn) {};
|
||||
Value(bool (*fn)()) : type(BOOL_FN), boolFn(fn) {};
|
||||
|
||||
float get() const {
|
||||
switch (type) {
|
||||
case FLOAT: return *_float;
|
||||
case INT: return *_int;
|
||||
case BOOL: return *_bool ? 1 : 0;
|
||||
case FLOAT_FN: return floatFn();
|
||||
case INT_FN: return intFn();
|
||||
case BOOL_FN: return boolFn() ? 1 : 0;
|
||||
default: return NAN;
|
||||
}
|
||||
};
|
||||
|
||||
void set(float value) const {
|
||||
switch (type) {
|
||||
case FLOAT: *_float = value; break;
|
||||
case INT: *_int = value; break;
|
||||
case BOOL: *_bool = (value != 0); break;
|
||||
default: break;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
// Rate limiter
|
||||
class Rate {
|
||||
public:
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
#define radians(deg) ((deg)*DEG_TO_RAD)
|
||||
#define degrees(rad) ((rad)*RAD_TO_DEG)
|
||||
|
||||
#define MALLOC_CAP_SPIRAM (1<<10)
|
||||
#define MALLOC_CAP_8BIT (1<<2)
|
||||
#define ESP_NOW_MAX_DATA_LEN_V2 1470
|
||||
|
||||
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
|
||||
template<typename T> T max(T a, T b) { return a > b ? a : b; }
|
||||
template<typename T> T min(T a, T b) { return a < b ? a : b; }
|
||||
@@ -156,6 +160,8 @@ HardwareSerial Serial, Serial1, Serial2;
|
||||
class EspClass {
|
||||
public:
|
||||
void restart() { Serial.println("Ignore reboot in simulation"); }
|
||||
uint32_t getFreeHeap() { return 300 * 1024; } // assume 300 KB free heap
|
||||
uint32_t getFreePsram() { return 8 * 1024 * 1024; } // assume 8 MB free PSRAM
|
||||
} ESP;
|
||||
|
||||
unsigned long __delayTime = 0;
|
||||
@@ -165,11 +171,16 @@ void delay(uint32_t ms) {
|
||||
__delayTime += ms * 1000;
|
||||
}
|
||||
|
||||
void *heap_caps_calloc(size_t n, size_t size, uint32_t caps) {
|
||||
return calloc(n, size);
|
||||
}
|
||||
|
||||
bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution) { return true; }
|
||||
bool ledcWrite(uint8_t pin, uint32_t duty) { return true; }
|
||||
uint32_t ledcChangeFrequency(uint8_t pin, uint32_t freq, uint8_t resolution) { return freq; }
|
||||
int8_t digitalPinToAnalogChannel(uint8_t pin) { return -1; }
|
||||
uint32_t analogReadMilliVolts(uint8_t pin) { return 0; }
|
||||
float temperatureRead() { return 0; }
|
||||
|
||||
unsigned long __micros;
|
||||
unsigned long __resetTime = 0;
|
||||
|
||||
+15
-1
@@ -51,8 +51,17 @@ void normalizeRC();
|
||||
void calibrateRC();
|
||||
void calibrateRCChannel(int*, uint16_t[16], uint16_t[16], const char*);
|
||||
void printRCCalibration();
|
||||
void loopLog();
|
||||
void resetLog();
|
||||
void writeLog(const void *data, size_t size);
|
||||
void readLog(void *data, size_t position, size_t size);
|
||||
bool isTopicUpdated(const uint8_t topic);
|
||||
void printLogInfo();
|
||||
int estimateLogDuration();
|
||||
void printLogHeader();
|
||||
void printLogData();
|
||||
void printLogValues(const char *filter);
|
||||
void configLogThrottle(const char *name, float throttle);
|
||||
void exposeLogValue(const char *name);
|
||||
void processMavlink();
|
||||
void sendMavlink();
|
||||
void sendMessage(const void *msg);
|
||||
@@ -83,3 +92,8 @@ void printIMUInfo() {};
|
||||
void printWiFiInfo() {};
|
||||
void configWiFi(bool, const char*, const char*) { print("Skip WiFi config\n"); };
|
||||
void setWiFiMode(const String& mode) { print("Skip WiFi mode set\n"); };
|
||||
|
||||
class IMU {
|
||||
public:
|
||||
float getTemp() { return 0; }
|
||||
} *imu;
|
||||
|
||||
@@ -55,6 +55,7 @@ public:
|
||||
initNode();
|
||||
Serial.begin(0);
|
||||
setupParameters();
|
||||
setupLog();
|
||||
rcRxPin = 1; // set rc pin to enable rc reading
|
||||
gzmsg << "Flix plugin loaded" << endl;
|
||||
}
|
||||
@@ -88,7 +89,7 @@ public:
|
||||
|
||||
applyMotorForces();
|
||||
publishTopics();
|
||||
logData();
|
||||
loopLog();
|
||||
syncParameters();
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
// Mocks
|
||||
int wifiMode = 1;
|
||||
int wifiLongRange = 0;
|
||||
int wifiBroadcast = 0;
|
||||
int espnowChannel = 6;
|
||||
const int W_DISABLED = 0, W_AP = 1, W_STA = 2, W_ESPNOW = 3;
|
||||
|
||||
|
||||
+10
-1
@@ -9,6 +9,7 @@ Usage:
|
||||
import csv
|
||||
import json
|
||||
import docopt
|
||||
import math
|
||||
from mcap.writer import Writer
|
||||
|
||||
args = docopt.docopt(__doc__)
|
||||
@@ -39,7 +40,15 @@ channel_id = writer.register_channel(
|
||||
)
|
||||
|
||||
for row in csv_reader:
|
||||
data = {key: float(value) for key, value in zip(header, row)}
|
||||
if row[0] == '': continue
|
||||
data = {}
|
||||
for key, value in zip(header, row):
|
||||
if value == '' or math.isnan(float(value)):
|
||||
data[key] = None
|
||||
else:
|
||||
data[key] = float(value)
|
||||
|
||||
data = {key: float(value) if value != '' else None for key, value in zip(header, row)}
|
||||
timestamp = round(float(row[0]) * 1e9)
|
||||
writer.add_message(channel_id=channel_id, log_time=timestamp, data=json.dumps(data).encode(), publish_time=timestamp,)
|
||||
|
||||
|
||||
Executable
+76
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""Convert flight from Flix format to CSV
|
||||
|
||||
Usage:
|
||||
log_to_csv.py <input_file>
|
||||
"""
|
||||
|
||||
import os
|
||||
from pyflix import Flix
|
||||
import docopt
|
||||
import struct
|
||||
import csv
|
||||
|
||||
DIR = os.path.dirname(os.path.realpath(__file__))
|
||||
HEADER_FILE = os.path.join(DIR, 'log/log_header.txt')
|
||||
|
||||
# Read log header
|
||||
try:
|
||||
# read from file
|
||||
header = open(HEADER_FILE, 'r').read()
|
||||
except FileNotFoundError:
|
||||
flix = Flix()
|
||||
header = flix.cli('log header') # receive the log schema
|
||||
open(HEADER_FILE, 'w').write(header) # save to file
|
||||
|
||||
# Parse log header
|
||||
topics = []
|
||||
for line in header.splitlines():
|
||||
if not line.startswith(' '):
|
||||
topics.append([])
|
||||
elif 'not logged' not in line:
|
||||
topics[-1].append(line.strip())
|
||||
|
||||
# Read log file
|
||||
args = docopt.docopt(__doc__)
|
||||
input_file = args['<input_file>']
|
||||
outfile_file = input_file + '.csv'
|
||||
data = open(input_file, 'rb').read()
|
||||
|
||||
# Search for sync marker
|
||||
SYNC_MARKER = bytes.fromhex('1A 91 4F F6 7F')
|
||||
sync_offset = data.find(SYNC_MARKER)
|
||||
if sync_offset == -1:
|
||||
raise ValueError('Sync marker not found in log file')
|
||||
data = data[sync_offset + len(SYNC_MARKER):]
|
||||
data = data.replace(SYNC_MARKER, b'') # remove all other sync markers
|
||||
|
||||
header_row = [f'{value}' for topic in topics for value in topic]
|
||||
rows = []
|
||||
|
||||
offset = 0
|
||||
while offset < len(data):
|
||||
try:
|
||||
topic = struct.unpack_from('B', data, offset)[0]
|
||||
offset += 1
|
||||
|
||||
if topic >= len(topics):
|
||||
raise ValueError(f'Invalid topic {topic} at offset {offset}')
|
||||
|
||||
if topic == 0 or not rows:
|
||||
rows.append({})
|
||||
|
||||
for name in topics[topic]:
|
||||
value = struct.unpack_from('<f', data, offset)[0]
|
||||
offset += 4
|
||||
rows[-1][name] = value
|
||||
except struct.error as e:
|
||||
break
|
||||
|
||||
# Write CSV file
|
||||
with open(outfile_file, 'w', newline='') as f:
|
||||
writer = csv.DictWriter(f, fieldnames=header_row, extrasaction='ignore')
|
||||
writer.writeheader()
|
||||
rows = filter(lambda row: float(row.get('t', 0)), rows)
|
||||
writer.writerows(rows)
|
||||
@@ -243,7 +243,7 @@ class Flix:
|
||||
time.sleep(1)
|
||||
|
||||
@staticmethod
|
||||
def _mavlink_to_flu(v: Sequence[float]) -> List[float]:
|
||||
def _mavlink_to_flu(v: List[float]) -> List[float]:
|
||||
if len(v) == 3: # vector
|
||||
return [v[0], -v[1], -v[2]]
|
||||
elif len(v) == 4: # quaternion
|
||||
@@ -252,8 +252,8 @@ class Flix:
|
||||
raise ValueError(f'List must have 3 (vector) or 4 (quaternion) elements')
|
||||
|
||||
@staticmethod
|
||||
def _flu_to_mavlink(v: Sequence[float]) -> List[float]:
|
||||
return Flix._mavlink_to_flu(v) # flu to mavlink is the same as mavlink to flu
|
||||
def _flu_to_mavlink(v: List[float]) -> List[float]:
|
||||
return Flix._mavlink_to_flu(v)
|
||||
|
||||
def _command_send(self, command: int, params: Sequence[float]):
|
||||
if len(params) != 7:
|
||||
@@ -320,13 +320,13 @@ class Flix:
|
||||
def set_armed(self, armed: bool):
|
||||
self._command_send(mavlink.MAV_CMD_COMPONENT_ARM_DISARM, (1 if armed else 0, 0, 0, 0, 0, 0, 0))
|
||||
|
||||
def set_position(self, position: Sequence[float], yaw: Optional[float] = None, wait: bool = False, tolerance: float = 0.1):
|
||||
def set_position(self, position: List[float], yaw: Optional[float] = None, wait: bool = False, tolerance: float = 0.1):
|
||||
raise NotImplementedError('Position control is not implemented yet')
|
||||
|
||||
def set_velocity(self, velocity: Sequence[float], yaw: Optional[float] = None):
|
||||
def set_velocity(self, velocity: List[float], yaw: Optional[float] = None):
|
||||
raise NotImplementedError('Velocity control is not implemented yet')
|
||||
|
||||
def set_attitude(self, attitude: Sequence[float], thrust: float):
|
||||
def set_attitude(self, attitude: List[float], thrust: float):
|
||||
if len(attitude) == 3:
|
||||
attitude = Quaternion([attitude[0], attitude[1], attitude[2]]).q # type: ignore
|
||||
elif len(attitude) != 4:
|
||||
@@ -339,7 +339,7 @@ class Flix:
|
||||
[attitude[0], attitude[1], attitude[2], attitude[3]],
|
||||
0, 0, 0, thrust)
|
||||
|
||||
def set_rates(self, rates: Sequence[float], thrust: float):
|
||||
def set_rates(self, rates: List[float], thrust: float):
|
||||
if len(rates) != 3:
|
||||
raise ValueError('Rates must be [roll_rate, pitch_rate, yaw_rate]')
|
||||
if not (0 <= thrust <= 1):
|
||||
@@ -351,7 +351,7 @@ class Flix:
|
||||
[1, 0, 0, 0],
|
||||
rates[0], rates[1], rates[2], thrust)
|
||||
|
||||
def set_motors(self, motors: Sequence[float]):
|
||||
def set_motors(self, motors: List[float]):
|
||||
if len(motors) != 4:
|
||||
raise ValueError('motors must have 4 values')
|
||||
if not all(0 <= m <= 1 for m in motors):
|
||||
|
||||
Reference in New Issue
Block a user