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

Fixed CI errors. changed _print_msg_once into private class member.

Browse Source 
Signed-off-by: Claudio Micheli <claudio@auterion.com>
This commit is contained in:
Claudio Micheli
2019-03-27 09:56:32 +01:00
committed by Julian Oes
parent e14e5b9d73
commit be6f753022
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+3 -4
View File
@@ -3834,7 +3834,6 @@ bool Commander::preflight_check(bool report)
void Commander::data_link_check(bool &status_changed)
{
bool updated = false;
static bool print_msg_once = false;
orb_check(_telemetry_status_sub, &updated);
@@ -3968,9 +3967,9 @@ void Commander::data_link_check(bool &status_changed)
//if avoidance never started
if (_datalink_last_heartbeat_avoidance_system == 0
&& hrt_elapsed_time(&_datalink_last_heartbeat_avoidance_system) > _oa_boot_timeout.get() * 1_s) {
if (!print_msg_once) {
if (!_print_msg_once) {
mavlink_log_critical(&mavlink_log_pub, "Avoidance system not available!");
print_msg_once = true;
_print_msg_once = true;
}
}
@@ -3981,7 +3980,7 @@ void Commander::data_link_check(bool &status_changed)
_avoidance_system_lost = true;
mavlink_log_critical(&mavlink_log_pub, "Avoidance system lost");
status_flags.avoidance_system_valid = false;
print_msg_once = false;
_print_msg_once = false;
}
//if status changed
src/modules/commander/Commander.hpp
+2 -1
View File
@@ -187,7 +187,6 @@ private:
hrt_abstime _datalink_last_heartbeat_avoidance_system{0};
bool _avoidance_system_lost{false};
hrt_abstime _avoidance_system_not_started{0};
bool _avoidance_system_status_change{false};
uint8_t _datalink_last_status_avoidance_system{telemetry_status_s::MAV_STATE_UNINIT};
@@ -204,6 +203,8 @@ private:
systemlib::Hysteresis _auto_disarm_landed{false};
systemlib::Hysteresis _auto_disarm_killed{false};
bool _print_msg_once{false};
// Subscriptions
Subscription<estimator_status_s> _estimator_status_sub{ORB_ID(estimator_status)};
Subscription<mission_result_s> _mission_result_sub{ORB_ID(mission_result)};