diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-17 14:45:20 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-17 14:45:20 +0200 |
| commit | 7bb78a4f9b7d6a4d4468c93154c3f3524e8ff929 (patch) | |
| tree | f239492841e34551fb2bf467b61f1c88359f1108 /src/modules/attitude_estimator_ekf | |
| parent | bca60b98bdc1bfe5a377946d8c50d8f5c54514d9 (diff) | |
| parent | a11895ac43b4e345ebd04d9999f386bc1408b98e (diff) | |
| download | px4-firmware-7bb78a4f9b7d6a4d4468c93154c3f3524e8ff929.tar.gz px4-firmware-7bb78a4f9b7d6a4d4468c93154c3f3524e8ff929.tar.bz2 px4-firmware-7bb78a4f9b7d6a4d4468c93154c3f3524e8ff929.zip | |
Merge remote-tracking branch 'drton/sdlog2' into new_state_machine
Conflicts:
src/modules/sdlog2/sdlog2.c
Diffstat (limited to 'src/modules/attitude_estimator_ekf')
| -rwxr-xr-x | src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp index 8e18c3c9a..16d5ad626 100755 --- a/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp +++ b/src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp @@ -126,7 +126,7 @@ int attitude_estimator_ekf_main(int argc, char *argv[]) attitude_estimator_ekf_task = task_spawn("attitude_estimator_ekf", SCHED_DEFAULT, SCHED_PRIORITY_MAX - 5, - 12400, + 14000, attitude_estimator_ekf_thread_main, (argv) ? (const char **)&argv[2] : (const char **)NULL); exit(0); |