diff options
| author | tnaegeli <naegelit@student.ethz.ch> | 2012-10-04 16:01:42 +0200 |
|---|---|---|
| committer | tnaegeli <naegelit@student.ethz.ch> | 2012-10-04 16:01:42 +0200 |
| commit | 8dfa66cb9710f1f5f8baddb6d0b542787af44f15 (patch) | |
| tree | 63d99d8861187b891274172a0f95a1fd816c48e9 /apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c | |
| parent | b9de72a8c9e97165c190020adf2d99849daf5f3a (diff) | |
| parent | 2a06b66845542b05e3cad3d21099e33adc213227 (diff) | |
| download | px4-firmware-8dfa66cb9710f1f5f8baddb6d0b542787af44f15.tar.gz px4-firmware-8dfa66cb9710f1f5f8baddb6d0b542787af44f15.tar.bz2 px4-firmware-8dfa66cb9710f1f5f8baddb6d0b542787af44f15.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
apps/commander/commander.c
apps/multirotor_att_control/multirotor_att_control_main.c
apps/multirotor_att_control/multirotor_rate_control.c
Diffstat (limited to 'apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c')
| -rw-r--r-- | apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c b/apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c index d2e0efb56..159a70701 100644 --- a/apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c +++ b/apps/attitude_estimator_ekf/attitude_estimator_ekf_main.c @@ -257,7 +257,7 @@ int attitude_estimator_ekf_thread_main(int argc, char *argv[]) { .fd = sub_raw, .events = POLLIN }, { .fd = sub_params, .events = POLLIN } }; - int ret = poll(fds, 1, 1000); + int ret = poll(fds, 2, 1000); if (ret < 0) { /* XXX this is seriously bad - should be an emergency */ |