fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 04:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

battery: delete unused armed

Browse Source
This commit is contained in:
Daniel Agar
2019-12-12 09:48:45 -05:00
parent 11bbc8ae34
commit de9e4dda4c
10 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/driver_framework_wrapper/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ int DfBebopBusWrapper::_publish(struct bebop_state_data &data)
// TODO Check if this is the right way for the Bebop
// We don't have current measurements
_battery.updateBatteryStatus(timestamp, data.battery_voltage_v, 0.0, true, true, 0, _last_throttle, _armed, false);
_battery.updateBatteryStatus(timestamp, data.battery_voltage_v, 0.0, true, true, 0, _last_throttle, false);
esc_status_s esc_status = {};
src/drivers/driver_framework_wrapper/df_ltc2946_wrapper/df_ltc2946_wrapper.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ int DfLtc2946Wrapper::_publish(const struct ltc2946_sensor_data &data)
_battery.updateBatteryStatus(t, data.battery_voltage_V, data.battery_current_A,
connected, true, 1,
ctrl.control[actuator_controls_s::INDEX_THROTTLE],
vcontrol_mode.flag_armed, true);
true);
return 0;
}
src/drivers/power_monitor/voxlpm/voxlpm.cpp
+2 -2
View File
@@ -162,7 +162,7 @@ VOXLPM::measure()
switch (_ch_type) {
case VOXLPM_CH_TYPE_VBATT: {
_battery.updateBatteryStatus(tnow, _voltage, _amperage, true, true, 0, 0, false, true);
_battery.updateBatteryStatus(tnow, _voltage, _amperage, true, true, 0, 0, true);
}
// fallthrough
@@ -183,7 +183,7 @@ VOXLPM::measure()
} else {
switch (_ch_type) {
case VOXLPM_CH_TYPE_VBATT: {
_battery.updateBatteryStatus(tnow, 0.0, 0.0, true, true, 0, 0, false, true);
_battery.updateBatteryStatus(tnow, 0.0, 0.0, true, true, 0, 0, true);
}
break;