fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 23:23:33 +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/modules/battery_status/battery_status.cpp
+1 -13
View File
@@ -59,7 +59,6 @@
#include <uORB/Subscription.hpp>
#include <uORB/Publication.hpp>
#include <uORB/topics/actuator_controls.h>
#include <uORB/topics/vehicle_control_mode.h>
#include <uORB/topics/parameter_update.h>
#include <uORB/topics/battery_status.h>
#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
@@ -130,11 +129,8 @@ public:
private:
DevHandle _h_adc; /**< ADC driver handle */
bool _armed{false}; /**< arming status of the vehicle */
uORB::Subscription _actuator_ctrl_0_sub{ORB_ID(actuator_controls_0)}; /**< attitude controls sub */
uORB::Subscription _parameter_update_sub{ORB_ID(parameter_update)}; /**< notification of parameter updates */
uORB::Subscription _vcontrol_mode_sub{ORB_ID(vehicle_control_mode)}; /**< vehicle control mode subscription */
AnalogBattery _battery1;
@@ -296,8 +292,7 @@ BatteryStatus::adc_poll()
bat_current_adc_readings[b],
selected_source == b,
b,
ctrl.control[actuator_controls_s::INDEX_THROTTLE],
_armed
ctrl.control[actuator_controls_s::INDEX_THROTTLE]
);
}
}
@@ -318,13 +313,6 @@ BatteryStatus::Run()
perf_begin(_loop_perf);
/* check vehicle status for changes to publication state */
if (_vcontrol_mode_sub.updated()) {
vehicle_control_mode_s vcontrol_mode{};
_vcontrol_mode_sub.copy(&vcontrol_mode);
_armed = vcontrol_mode.flag_armed;
}
/* check parameters for updates */
parameter_update_poll();