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

commander: fixes after rebase

Browse Source
This commit is contained in:
Julian Oes
2016-04-11 18:01:49 +02:00
parent 32f2b89252
commit c9ac9c7dbd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+1 -1
View File
@@ -1966,7 +1966,7 @@ int commander_thread_main(int argc, char *argv[])
mavlink_log_critical(&mavlink_log_pub, "LOW BATTERY, TAKEOFF DISCOURAGED"); mavlink_log_critical(&mavlink_log_pub, "LOW BATTERY, TAKEOFF DISCOURAGED");
} }
} else if (!status.usb_connected && } else if (!status_flags.usb_connected &&
battery.warning == battery_status_s::BATTERY_WARNING_CRITICAL && battery.warning == battery_status_s::BATTERY_WARNING_CRITICAL &&
!critical_battery_voltage_actions_done && !critical_battery_voltage_actions_done &&
low_battery_voltage_actions_done) { low_battery_voltage_actions_done) {
src/modules/commander/state_machine_helper.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ transition_result_t arming_state_transition(struct vehicle_status_s *status,
&& status->hil_state == vehicle_status_s::HIL_STATE_OFF) { && status->hil_state == vehicle_status_s::HIL_STATE_OFF) {
if (last_preflight_check == 0 || hrt_absolute_time() - last_preflight_check > 1000 * 1000) { if (last_preflight_check == 0 || hrt_absolute_time() - last_preflight_check > 1000 * 1000) {
prearm_ret = preflight_check(status, mavlink_log_pub, false /* pre-flight */, prearm_ret = preflight_check(status, mavlink_log_pub, false /* pre-flight */, false /* force_report */,
status_flags, battery); status_flags, battery);
status_flags->condition_system_sensors_initialized = !prearm_ret; status_flags->condition_system_sensors_initialized = !prearm_ret;
last_preflight_check = hrt_absolute_time(); last_preflight_check = hrt_absolute_time();
src/modules/commander/state_machine_helper.h
+1 -1
View File
@@ -114,6 +114,6 @@ bool set_nav_state(struct vehicle_status_s *status, struct commander_state_s *in
const bool data_link_loss_enabled, const bool mission_finished, const bool data_link_loss_enabled, const bool mission_finished,
const bool stay_in_failsafe, status_flags_s *status_flags, bool landed); const bool stay_in_failsafe, status_flags_s *status_flags, bool landed);
int preflight_check(struct vehicle_status_s *status, orb_advert_t *mavlink_log_pub, bool prearm, status_flags_s *status_flags, battery_status_s *battery); int preflight_check(struct vehicle_status_s *status, orb_advert_t *mavlink_log_pub, bool prearm, bool force_report, status_flags_s *status_flags, battery_status_s *battery);
#endif /* STATE_MACHINE_HELPER_H_ */ #endif /* STATE_MACHINE_HELPER_H_ */