mirror of
https://github.com/okalachev/flix.git
synced 2026-06-27 21:46:38 +00:00
Implement battery voltage monitoring
Add power subsystem. Add PWR_VOLT_PIN, PWR_VOLT_SCALE, PWR_VOLT_LPF_A parameters. Support BATTERY_STATUS mavlink messages streaming. Add pw cli command. Add voltage field to pyflix library.
This commit is contained in:
@@ -156,6 +156,8 @@ You can see a user-contributed [variant of complete circuit diagram](https://mir
|
|||||||
|
|
||||||
*¹ — UART2 RX pin was [changed](https://docs.espressif.com/projects/arduino-esp32/en/latest/migration_guides/2.x_to_3.0.html#id14) to GPIO4 in Arduino ESP32 core 3.0.*
|
*¹ — UART2 RX pin was [changed](https://docs.espressif.com/projects/arduino-esp32/en/latest/migration_guides/2.x_to_3.0.html#id14) to GPIO4 in Arduino ESP32 core 3.0.*
|
||||||
|
|
||||||
|
* Optionally connect the battery voltage divider for voltage monitoring to any ADC1 pin (e. g. *GPIO32* on ESP32, *GPIO3* on ESP32S3).
|
||||||
|
|
||||||
## Resources
|
## Resources
|
||||||
|
|
||||||
* Telegram channel on developing the drone and the flight controller (in Russian): https://t.me/opensourcequadcopter.
|
* Telegram channel on developing the drone and the flight controller (in Russian): https://t.me/opensourcequadcopter.
|
||||||
|
|||||||
@@ -146,6 +146,15 @@ If using brushless motors and ESCs:
|
|||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> **Remove the props when configuring the motors!** If improperly configured, you may not be able to stop them.
|
> **Remove the props when configuring the motors!** If improperly configured, you may not be able to stop them.
|
||||||
|
|
||||||
|
### Battery voltage monitoring
|
||||||
|
|
||||||
|
ESP32 ADC can measure only up to 3.3 V, so you need to use a voltage divider to monitor the battery voltage. To enable voltage measurement, set the following parameters:
|
||||||
|
|
||||||
|
1. `PWR_VOLT_PIN` — GPIO pin number where the voltage divider is connected (*-1* to disable).
|
||||||
|
2. `PWR_VOLT_SCALE` — voltage divider coefficient (*2* for two equal resistors).
|
||||||
|
|
||||||
|
After this setup, you should see the battery voltage in QGroundControl top panel or using `pw` command in the console.
|
||||||
|
|
||||||
### Important: check everything works
|
### Important: check everything works
|
||||||
|
|
||||||
1. Check the IMU is working: perform `imu` command in the console and check the output:
|
1. Check the IMU is working: perform `imu` command in the console and check the output:
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ extern float controlTime;
|
|||||||
extern int mode;
|
extern int mode;
|
||||||
extern bool armed;
|
extern bool armed;
|
||||||
extern LowPassFilter<Vector> gyroBiasFilter;
|
extern LowPassFilter<Vector> gyroBiasFilter;
|
||||||
|
extern float voltage;
|
||||||
|
|
||||||
const char* motd =
|
const char* motd =
|
||||||
"\nWelcome to\n"
|
"\nWelcome to\n"
|
||||||
@@ -39,6 +40,7 @@ const char* motd =
|
|||||||
"disarm - disarm the drone\n"
|
"disarm - disarm the drone\n"
|
||||||
"raw/stab/acro/auto - set mode\n"
|
"raw/stab/acro/auto - set mode\n"
|
||||||
"rc - show RC data\n"
|
"rc - show RC data\n"
|
||||||
|
"pw - show power info\n"
|
||||||
"wifi - show Wi-Fi info\n"
|
"wifi - show Wi-Fi info\n"
|
||||||
"ap <ssid> <password> - setup Wi-Fi access point\n"
|
"ap <ssid> <password> - setup Wi-Fi access point\n"
|
||||||
"sta <ssid> <password> - setup Wi-Fi client mode\n"
|
"sta <ssid> <password> - setup Wi-Fi client mode\n"
|
||||||
@@ -135,6 +137,8 @@ void doCommand(String str, bool echo = false) {
|
|||||||
print("time: %.1f\n", controlTime);
|
print("time: %.1f\n", controlTime);
|
||||||
print("mode: %s\n", getModeName());
|
print("mode: %s\n", getModeName());
|
||||||
print("armed: %d\n", armed);
|
print("armed: %d\n", armed);
|
||||||
|
} else if (command == "pw") {
|
||||||
|
print("Voltage: %.1f V\n", voltage);
|
||||||
} else if (command == "wifi") {
|
} else if (command == "wifi") {
|
||||||
printWiFiInfo();
|
printWiFiInfo();
|
||||||
} else if (command == "ap") {
|
} else if (command == "ap") {
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ void loop() {
|
|||||||
sendMotors();
|
sendMotors();
|
||||||
handleInput();
|
handleInput();
|
||||||
processMavlink();
|
processMavlink();
|
||||||
|
readVoltage();
|
||||||
logData();
|
logData();
|
||||||
syncParameters();
|
syncParameters();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
extern float controlTime;
|
extern float controlTime;
|
||||||
|
extern float voltage;
|
||||||
|
|
||||||
int mavlinkSysId = 1;
|
int mavlinkSysId = 1;
|
||||||
Rate telemetryFast(10);
|
Rate telemetryFast(10);
|
||||||
@@ -39,6 +40,13 @@ void sendMavlink() {
|
|||||||
mavlink_msg_extended_sys_state_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &msg,
|
mavlink_msg_extended_sys_state_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &msg,
|
||||||
MAV_VTOL_STATE_UNDEFINED, landed ? MAV_LANDED_STATE_ON_GROUND : MAV_LANDED_STATE_IN_AIR);
|
MAV_VTOL_STATE_UNDEFINED, landed ? MAV_LANDED_STATE_ON_GROUND : MAV_LANDED_STATE_IN_AIR);
|
||||||
sendMessage(&msg);
|
sendMessage(&msg);
|
||||||
|
|
||||||
|
uint16_t voltages[] = {voltage * 1000, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX};
|
||||||
|
uint16_t voltagesExt[] = {0, 0, 0, 0};
|
||||||
|
float remaining = constrain(mapf(voltage, 3.4, 4.2, 0, 1), 0, 1);
|
||||||
|
mavlink_msg_battery_status_pack(mavlinkSysId, MAV_COMP_ID_AUTOPILOT1, &msg, 0, MAV_BATTERY_FUNCTION_ALL,
|
||||||
|
MAV_BATTERY_TYPE_LIPO, INT16_MAX, voltages, -1, -1, -1, remaining * 100, 0, MAV_BATTERY_CHARGE_STATE_OK, voltagesExt, 0, 0);
|
||||||
|
sendMessage(&msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (telemetryFast && mavlinkConnected) {
|
if (telemetryFast && mavlinkConnected) {
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ extern int rollChannel, pitchChannel, throttleChannel, yawChannel, armedChannel,
|
|||||||
extern int rcRxPin;
|
extern int rcRxPin;
|
||||||
extern int wifiMode, udpLocalPort, udpRemotePort;
|
extern int wifiMode, udpLocalPort, udpRemotePort;
|
||||||
extern float rcLossTimeout, descendTime;
|
extern float rcLossTimeout, descendTime;
|
||||||
|
extern int voltagePin;
|
||||||
|
extern float voltageScale;
|
||||||
|
extern LowPassFilter<float> voltageFilter;
|
||||||
|
|
||||||
Preferences storage;
|
Preferences storage;
|
||||||
|
|
||||||
@@ -109,6 +112,10 @@ Parameter parameters[] = {
|
|||||||
{"MAV_SYS_ID", &mavlinkSysId},
|
{"MAV_SYS_ID", &mavlinkSysId},
|
||||||
{"MAV_RATE_SLOW", &telemetrySlow.rate},
|
{"MAV_RATE_SLOW", &telemetrySlow.rate},
|
||||||
{"MAV_RATE_FAST", &telemetryFast.rate},
|
{"MAV_RATE_FAST", &telemetryFast.rate},
|
||||||
|
// power
|
||||||
|
{"PWR_VOLT_PIN", &voltagePin},
|
||||||
|
{"PWR_VOLT_SCALE", &voltageScale},
|
||||||
|
{"PWR_VOLT_LPF_A", &voltageFilter.alpha},
|
||||||
// safety
|
// safety
|
||||||
{"SF_RC_LOSS_TIME", &rcLossTimeout},
|
{"SF_RC_LOSS_TIME", &rcLossTimeout},
|
||||||
{"SF_DESCEND_TIME", &descendTime},
|
{"SF_DESCEND_TIME", &descendTime},
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
// Copyright (c) 2026 Oleg Kalachev <okalachev@gmail.com>
|
||||||
|
// Repository: https://github.com/okalachev/flix
|
||||||
|
|
||||||
|
// Power management
|
||||||
|
|
||||||
|
#include "lpf.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
|
float voltage;
|
||||||
|
LowPassFilter<float> voltageFilter(0.2);
|
||||||
|
int voltagePin = -1;
|
||||||
|
float voltageScale = 2;
|
||||||
|
|
||||||
|
void readVoltage() {
|
||||||
|
if (voltagePin < 0) return;
|
||||||
|
static Rate rate(10);
|
||||||
|
if (!rate) return;
|
||||||
|
|
||||||
|
float v = analogReadMilliVolts(voltagePin) * voltageScale / 1000.0f;
|
||||||
|
voltage = voltageFilter.update(v);
|
||||||
|
}
|
||||||
@@ -166,6 +166,7 @@ void delay(uint32_t ms) {
|
|||||||
bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution) { return true; }
|
bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution) { return true; }
|
||||||
bool ledcWrite(uint8_t pin, uint32_t duty) { 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; }
|
uint32_t ledcChangeFrequency(uint8_t pin, uint32_t freq, uint8_t resolution) { return freq; }
|
||||||
|
uint32_t analogReadMilliVolts(uint8_t pin) { return 0; }
|
||||||
|
|
||||||
unsigned long __micros;
|
unsigned long __micros;
|
||||||
unsigned long __resetTime = 0;
|
unsigned long __resetTime = 0;
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include "mavlink.ino"
|
#include "mavlink.ino"
|
||||||
#include "motors.ino"
|
#include "motors.ino"
|
||||||
#include "parameters.ino"
|
#include "parameters.ino"
|
||||||
|
#include "power.ino"
|
||||||
#include "rc.ino"
|
#include "rc.ino"
|
||||||
#include "time.ino"
|
#include "time.ino"
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ print('Connected:', flix.connected)
|
|||||||
print('Mode:', flix.mode)
|
print('Mode:', flix.mode)
|
||||||
print('Armed:', flix.armed)
|
print('Armed:', flix.armed)
|
||||||
print('Landed:', flix.landed)
|
print('Landed:', flix.landed)
|
||||||
|
print('Voltage:', flix.voltage, 'V')
|
||||||
print('Rates:', *[f'{math.degrees(r):.0f}°/s' for r in flix.rates])
|
print('Rates:', *[f'{math.degrees(r):.0f}°/s' for r in flix.rates])
|
||||||
print('Attitude:', *[f'{math.degrees(a):.0f}°' for a in flix.attitude_euler])
|
print('Attitude:', *[f'{math.degrees(a):.0f}°' for a in flix.attitude_euler])
|
||||||
print('Motors:', flix.motors)
|
print('Motors:', flix.motors)
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ print(flix.connected) # True if connected to the drone
|
|||||||
print(flix.mode) # current flight mode (str)
|
print(flix.mode) # current flight mode (str)
|
||||||
print(flix.armed) # True if the drone is armed
|
print(flix.armed) # True if the drone is armed
|
||||||
print(flix.landed) # True if the drone is landed
|
print(flix.landed) # True if the drone is landed
|
||||||
|
print(flix.voltage) # battery voltage
|
||||||
print(flix.attitude) # attitude quaternion [w, x, y, z]
|
print(flix.attitude) # attitude quaternion [w, x, y, z]
|
||||||
print(flix.attitude_euler) # attitude as Euler angles [roll, pitch, yaw]
|
print(flix.attitude_euler) # attitude as Euler angles [roll, pitch, yaw]
|
||||||
print(flix.rates) # angular rates [roll_rate, pitch_rate, yaw_rate]
|
print(flix.rates) # angular rates [roll_rate, pitch_rate, yaw_rate]
|
||||||
@@ -95,6 +96,7 @@ Full list of events:
|
|||||||
|`armed`|Armed state update|Armed state *(bool)*|
|
|`armed`|Armed state update|Armed state *(bool)*|
|
||||||
|`mode`|Flight mode update|Flight mode *(str)*|
|
|`mode`|Flight mode update|Flight mode *(str)*|
|
||||||
|`landed`|Landed state update|Landed state *(bool)*|
|
|`landed`|Landed state update|Landed state *(bool)*|
|
||||||
|
|`voltage`|Battery voltage update|Voltage *(float)*|
|
||||||
|`print`|The drone prints text to the console|Text|
|
|`print`|The drone prints text to the console|Text|
|
||||||
|`attitude`|Attitude update|Attitude quaternion *(list)*|
|
|`attitude`|Attitude update|Attitude quaternion *(list)*|
|
||||||
|`attitude_euler`|Attitude update|Euler angles *(list)*|
|
|`attitude_euler`|Attitude update|Euler angles *(list)*|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ class Flix:
|
|||||||
mode: str = ''
|
mode: str = ''
|
||||||
armed: bool = False
|
armed: bool = False
|
||||||
landed: bool = False
|
landed: bool = False
|
||||||
|
voltage: float = 0
|
||||||
attitude: List[float]
|
attitude: List[float]
|
||||||
attitude_euler: List[float] # roll, pitch, yaw
|
attitude_euler: List[float] # roll, pitch, yaw
|
||||||
rates: List[float]
|
rates: List[float]
|
||||||
@@ -68,7 +69,7 @@ class Flix:
|
|||||||
self._heartbeat_thread.start()
|
self._heartbeat_thread.start()
|
||||||
if wait_connection:
|
if wait_connection:
|
||||||
self.wait('mavlink.HEARTBEAT')
|
self.wait('mavlink.HEARTBEAT')
|
||||||
time.sleep(0.2) # give some time to receive initial state
|
time.sleep(0.6) # give some time to receive initial state
|
||||||
|
|
||||||
def _init_state(self):
|
def _init_state(self):
|
||||||
self.attitude = [1, 0, 0, 0]
|
self.attitude = [1, 0, 0, 0]
|
||||||
@@ -190,6 +191,10 @@ class Flix:
|
|||||||
self._trigger('acc', self.acc)
|
self._trigger('acc', self.acc)
|
||||||
self._trigger('gyro', self.gyro)
|
self._trigger('gyro', self.gyro)
|
||||||
|
|
||||||
|
if isinstance(msg, mavlink.MAVLink_battery_status_message):
|
||||||
|
self.voltage = msg.voltages[0] / 1000
|
||||||
|
self._trigger('voltage', self.voltage)
|
||||||
|
|
||||||
if isinstance(msg, mavlink.MAVLink_serial_control_message):
|
if isinstance(msg, mavlink.MAVLink_serial_control_message):
|
||||||
# new chunk of data
|
# new chunk of data
|
||||||
text = bytes(msg.data)[:msg.count].decode('utf-8', errors='ignore')
|
text = bytes(msg.data)[:msg.count].decode('utf-8', errors='ignore')
|
||||||
|
|||||||
Reference in New Issue
Block a user