diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-18 14:14:50 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-18 14:14:50 +0200 |
| commit | efd05d701ad1393c0262a39ed998e9a0072fdec8 (patch) | |
| tree | b14909e1b53e37ecfa3b9abaf5d89ccf6e0e4a8a /src/modules/sdlog2 | |
| parent | 171ea5e12b784606ce4f7b3c31031bc4b2a45de4 (diff) | |
| parent | 55e5f747de013fb386727b41cc67bd019c129c31 (diff) | |
| download | px4-firmware-efd05d701ad1393c0262a39ed998e9a0072fdec8.tar.gz px4-firmware-efd05d701ad1393c0262a39ed998e9a0072fdec8.tar.bz2 px4-firmware-efd05d701ad1393c0262a39ed998e9a0072fdec8.zip | |
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/sdlog2')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 0b4c5478a..69dc67695 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1118,7 +1118,7 @@ int sdlog2_thread_main(int argc, char *argv[]) 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.arming_state = (uint8_t) buf_status.arming_state; - log_msg.body.log_STAT.failsafe_state = (uint8_t) buf_status.failsafe_state; + log_msg.body.log_STAT.failsafe_state = (uint8_t) buf_status.failsafe; log_msg.body.log_STAT.battery_remaining = buf_status.battery_remaining; log_msg.body.log_STAT.battery_warning = (uint8_t) buf_status.battery_warning; log_msg.body.log_STAT.landed = (uint8_t) buf_status.condition_landed; |