yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 09:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2406 from mcharleb/logging-v3

Browse Source 
Improved logging with both compile and runtime level filtering
This commit is contained in:
Lorenz Meier
2015-07-01 23:31:50 +02:00
parent 13e585f9fb 785053e4f1
commit 509ec90b76
6 changed files with 286 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/commander/state_machine_helper.cpp
View File

@@ -268,14 +268,15 @@ arming_state_transition(struct vehicle_status_s *status, ///< current vehicle s
}
if (ret == TRANSITION_DENIED) {
const char * str = "INVAL: %s - %s";
#define WARNSTR "INVAL: %s - %s"
/* only print to console here by default as this is too technical to be useful during operation */
warnx(str, state_names[status->arming_state], state_names[new_arming_state]);
warnx(WARNSTR, state_names[status->arming_state], state_names[new_arming_state]);
/* print to MAVLink if we didn't provide any feedback yet */
if (!feedback_provided) {
mavlink_log_critical(mavlink_fd, str, state_names[status->arming_state], state_names[new_arming_state]);
mavlink_log_critical(mavlink_fd, WARNSTR, state_names[status->arming_state], state_names[new_arming_state]);
}
#undef WARNSTR
}
return ret;