diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-02 16:40:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-02 16:40:26 +0200 |
| commit | e9290e7fc0f05f186f60c2af4beae35b75236e37 (patch) | |
| tree | 1625c377efa434034f8924570000bb51349cf919 /src/modules/fixedwing_pos_control | |
| parent | 4edb6ce76bf7f360bfefacf7e83045c92f070e40 (diff) | |
| parent | 697c0a1a1d7fb1043786533da3570f28acd661dc (diff) | |
| download | px4-firmware-e9290e7fc0f05f186f60c2af4beae35b75236e37.tar.gz px4-firmware-e9290e7fc0f05f186f60c2af4beae35b75236e37.tar.bz2 px4-firmware-e9290e7fc0f05f186f60c2af4beae35b75236e37.zip | |
Merge branch 'master' of github.com:PX4/Firmware into origin_integration
Diffstat (limited to 'src/modules/fixedwing_pos_control')
| -rw-r--r-- | src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c b/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c index 48c0b9f9d..73df3fb9e 100644 --- a/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c +++ b/src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c @@ -239,10 +239,10 @@ int fixedwing_pos_control_thread_main(int argc, char *argv[]) parameters_init(&h); parameters_update(&h, &p); - pid_init(&heading_controller, p.heading_p, 0.0f, 0.0f, 0.0f, 10000.0f, PID_MODE_DERIVATIV_NONE); //arbitrary high limit - pid_init(&heading_rate_controller, p.headingr_p, p.headingr_i, 0.0f, 0.0f, p.roll_lim, PID_MODE_DERIVATIV_NONE); - pid_init(&altitude_controller, p.altitude_p, 0.0f, 0.0f, 0.0f, p.pitch_lim, PID_MODE_DERIVATIV_NONE); - pid_init(&offtrack_controller, p.xtrack_p, 0.0f, 0.0f, 0.0f , 60.0f * M_DEG_TO_RAD, PID_MODE_DERIVATIV_NONE); //TODO: remove hardcoded value + pid_init(&heading_controller, p.heading_p, 0.0f, 0.0f, 0.0f, 10000.0f, PID_MODE_DERIVATIV_NONE, 0.0f); //arbitrary high limit + pid_init(&heading_rate_controller, p.headingr_p, p.headingr_i, 0.0f, 0.0f, p.roll_lim, PID_MODE_DERIVATIV_NONE, 0.0f); + pid_init(&altitude_controller, p.altitude_p, 0.0f, 0.0f, 0.0f, p.pitch_lim, PID_MODE_DERIVATIV_NONE, 0.0f); + pid_init(&offtrack_controller, p.xtrack_p, 0.0f, 0.0f, 0.0f , 60.0f * M_DEG_TO_RAD, PID_MODE_DERIVATIV_NONE, 0.0f); //TODO: remove hardcoded value /* error and performance monitoring */ perf_counter_t fw_interval_perf = perf_alloc(PC_INTERVAL, "fixedwing_pos_control_interval"); |