fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-12 06:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

battery: pass priority in by setter

Browse Source
This commit is contained in:
Matthias Grob
2021-12-07 21:06:51 +01:00
parent f9fc9a9af6
commit 38d23f5345
12 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/battery/battery.cpp
+2 -3
View File
@@ -97,8 +97,7 @@ Battery::Battery(int index, ModuleParams *parent, const int sample_interval_us,
updateParams();
}
void Battery::updateBatteryStatus(const hrt_abstime &timestamp, float voltage_v, float current_a, bool connected,
int priority)
void Battery::updateBatteryStatus(const hrt_abstime &timestamp, float voltage_v, float current_a, bool connected)
{
if (!_battery_initialized) {
_voltage_filter_v.reset(voltage_v);
@@ -136,7 +135,7 @@ void Battery::updateBatteryStatus(const hrt_abstime &timestamp, float voltage_v,
battery_status.cell_count = _params.n_cells;
battery_status.connected = connected;
battery_status.source = _source;
battery_status.priority = priority;
battery_status.priority = _priority;
battery_status.capacity = _params.capacity > 0.f ? static_cast<uint16_t>(_params.capacity) : 0;
battery_status.id = static_cast<uint8_t>(_index);
battery_status.warning = _warning;