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

mavlink log: ensure all critical & emergency msgs are also logged to console & ulog

Browse Source 
Critical messages that the user sees should also go to the log file, so
that the exact error (with time) can later be analyzed from the log file.
This commit is contained in:
Beat Küng
2016-09-30 13:50:51 +02:00
committed by Julian Oes
parent 241fd629ce
commit ce0d31b7d9
17 changed files with 116 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4io/px4io.cpp
+9 -9
View File
@@ -683,12 +683,12 @@ PX4IO::init()
/* if the error still persists after timing out, we give up */
if (protocol == _io_reg_get_error) {
mavlink_and_console_log_emergency(&_mavlink_log_pub, "Failed to communicate with IO, abort.");
mavlink_log_emergency(&_mavlink_log_pub, "Failed to communicate with IO, abort.");
return -1;
}
if (protocol != PX4IO_PROTOCOL_VERSION) {
mavlink_and_console_log_emergency(&_mavlink_log_pub, "IO protocol/firmware mismatch, abort.");
mavlink_log_emergency(&_mavlink_log_pub, "IO protocol/firmware mismatch, abort.");
return -1;
}
@@ -755,7 +755,7 @@ PX4IO::init()
/* get a status update from IO */
io_get_status();
mavlink_and_console_log_emergency(&_mavlink_log_pub, "RECOVERING FROM FMU IN-AIR RESTART");
mavlink_log_emergency(&_mavlink_log_pub, "RECOVERING FROM FMU IN-AIR RESTART");
/* WARNING: COMMANDER app/vehicle status must be initialized.
* If this fails (or the app is not started), worst-case IO
@@ -784,7 +784,7 @@ PX4IO::init()
/* abort after 5s */
if ((hrt_absolute_time() - try_start_time) / 1000 > 3000) {
mavlink_and_console_log_emergency(&_mavlink_log_pub, "Failed to recover from in-air restart (1), abort");
mavlink_log_emergency(&_mavlink_log_pub, "Failed to recover from in-air restart (1), abort");
return 1;
}
@@ -840,7 +840,7 @@ PX4IO::init()
/* abort after 5s */
if ((hrt_absolute_time() - try_start_time) / 1000 > 2000) {
mavlink_and_console_log_emergency(&_mavlink_log_pub, "Failed to recover from in-air restart (2), abort");
mavlink_log_emergency(&_mavlink_log_pub, "Failed to recover from in-air restart (2), abort");
return 1;
}
@@ -887,7 +887,7 @@ PX4IO::init()
ret = io_set_rc_config();
if (ret != OK) {
mavlink_and_console_log_critical(&_mavlink_log_pub, "IO RC config upload fail");
mavlink_log_critical(&_mavlink_log_pub, "IO RC config upload fail");
return ret;
}
}
@@ -1115,7 +1115,7 @@ PX4IO::task_main()
int pret = io_reg_set(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_VBATT_SCALE, &scaling, 1);
if (pret != OK) {
mavlink_and_console_log_critical(&_mavlink_log_pub, "IO vscale upload failed");
mavlink_log_critical(&_mavlink_log_pub, "IO vscale upload failed");
}
/* send RC throttle failsafe value to IO */
@@ -1132,7 +1132,7 @@ PX4IO::task_main()
pret = io_reg_set(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_RC_THR_FAILSAFE_US, &failsafe_thr, 1);
if (pret != OK) {
mavlink_and_console_log_critical(&_mavlink_log_pub, "failsafe upload failed, FS: %d us", (int)failsafe_thr);
mavlink_log_critical(&_mavlink_log_pub, "failsafe upload failed, FS: %d us", (int)failsafe_thr);
}
}
}
@@ -1610,7 +1610,7 @@ PX4IO::io_set_rc_config()
/* check the IO initialisation flag */
if (!(io_reg_get(PX4IO_PAGE_STATUS, PX4IO_P_STATUS_FLAGS) & PX4IO_P_STATUS_FLAGS_INIT_OK)) {
mavlink_and_console_log_critical(&_mavlink_log_pub, "config for RC%u rejected by IO", i + 1);
mavlink_log_critical(&_mavlink_log_pub, "config for RC%u rejected by IO", i + 1);
break;
}