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

Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector

Browse Source
This commit is contained in:
Anton Babushkin
2013-12-30 08:55:26 +04:00
parent f084ddfeb0 95bdc1a9bd
commit a71b04775c
41 changed files with 1633 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/sdlog2.c
+2 -1
View File
@@ -973,7 +973,8 @@ int sdlog2_thread_main(int argc, char *argv[])
// Don't orb_copy, it's already done few lines above
log_msg.msg_type = LOG_STAT_MSG;
log_msg.body.log_STAT.main_state = (uint8_t) buf_status.main_state;
log_msg.body.log_STAT.navigation_state = (uint8_t) buf_status.navigation_state;
// TODO use control_mode topic
//log_msg.body.log_STAT.navigation_state = (uint8_t) buf_status.navigation_state;
log_msg.body.log_STAT.arming_state = (uint8_t) buf_status.arming_state;
log_msg.body.log_STAT.battery_voltage = buf_status.battery_voltage;
log_msg.body.log_STAT.battery_current = buf_status.battery_current;