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

land_detector: cleanup actuator_armed and battery_status naming

Browse Source 
* Rename _arming -> _actuator_armed
 * Rename _battery -> _battery_status in the MulticopterLandDetector class.
This commit is contained in:
Mark Sauder
2019-06-27 12:02:14 -04:00
committed by Daniel Agar
parent 94c1f21473
commit 1466d11acc
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/land_detector/LandDetector.cpp
+3 -3
View File
@@ -80,7 +80,7 @@ void LandDetector::Run()
perf_begin(_cycle_perf);
_check_params(false);
_actuator_armed_sub.update(&_arming);
_actuator_armed_sub.update(&_actuator_armed);
_update_topics();
_update_state();
@@ -124,7 +124,7 @@ void LandDetector::Run()
// set the flight time when disarming (not necessarily when landed, because all param changes should
// happen on the same event and it's better to set/save params while not in armed state)
if (_takeoff_time != 0 && !_arming.armed && _previous_armed_state) {
if (_takeoff_time != 0 && !_actuator_armed.armed && _previous_armed_state) {
_total_flight_time += now - _takeoff_time;
_takeoff_time = 0;
@@ -139,7 +139,7 @@ void LandDetector::Run()
_param_total_flight_time_low.commit_no_notification();
}
_previous_armed_state = _arming.armed;
_previous_armed_state = _actuator_armed.armed;
perf_end(_cycle_perf);