Commit Graph

173 Commits

Author SHA1 Message Date
Youssef Demitri 170f0032fd updated to master (solve merge conflicts) 2015-11-06 12:18:31 +01:00
Roman Bapst 85605f72f2 Merge pull request #2814 from PX4/mc_pos_guard
MC position controller: Guard against invalid setpoints
2015-11-06 09:17:05 +01:00
tumbili a567b9956f fix position hold logic 2015-11-02 16:11:24 +01:00
Roman 601da2818b do not set position setpoint too early 2015-11-01 10:13:55 +01:00
Lorenz Meier 878dc4d7d4 MC pos ctrl: Do not build unused param file 2015-10-29 10:36:54 +01:00
Youssef Demitri dd59409e31 updated to master (solved merge conflicts) 2015-10-27 09:26:27 +01:00
jgoppert 0106be3e89 Added local position estimator. 2015-10-24 20:34:33 +02:00
Youssef Demitri efe82194af ported control state attitude into mc_pos_ctrl 2015-10-16 16:03:25 +02:00
tumbili b3f912ecc1 reset position setpoint when in velocity control mode 2015-10-16 12:38:53 +02:00
v01d 8133f8d616 disable pos/alt controllers when following velocity setpoints in offboard mode 2015-10-16 11:13:52 +02:00
v01d 44bb50e9ea separate _DZ parameter to XY and Z. this allows disabling pos hold for XY and not Z 2015-10-16 11:13:52 +02:00
v01d 9c49b30118 run position controller in main_task, otherwise position setpoints will not be followed 2015-10-16 11:13:52 +02:00
v01d c010962861 change unit of MPC_HOLD_DZ parameter to "%" 2015-10-16 11:13:52 +02:00
v01d 42ccc654b5 fix float comparison to 0.0f 2015-10-16 11:13:52 +02:00
v01d da3087e54c expose pos-hold parameters (also allows different behaviours) 2015-10-16 11:13:52 +02:00
v01d 324c27b941 velocity control implemented: tested in SITL under manual mode 2015-10-16 11:13:52 +02:00
tumbili 759d2a3dff mc position control:
- directly use commanded velocity for control
- use position error to derive desired velocity when in position hold mode
2015-10-16 11:13:52 +02:00
Lorenz Meier 104f38eea8 MC position controller: Guard against invalid setpoints 2015-10-15 22:38:58 +02:00
Micah Corah f1cc601ca8 L1 -> unit, L1 easily confused with L1 norm 2015-10-06 17:15:08 -04:00
Lorenz Meier fa5071b3c5 Remove module.mk files to prevent confusion of adopters upgrading 2015-10-06 11:23:20 +02:00
James Goppert 1d6b31d196 Switch to cmake build system. 2015-09-07 20:37:45 -04:00
Andreas Antener 9e1713eb9f constantly reset altitude and yaw setpoint in mc pos control when not in rotary wing mode 2015-08-24 10:38:33 +02:00
Simon Wilks f7e4a4852d Reset the altitude setpoint. 2015-08-24 10:38:33 +02:00
tumbili 044097afbb mc_pos_controller: fix logic for att sp publication 2015-08-13 22:58:32 +02:00
Simon Wilks d786fd4a1b mc pos reset yaw when vtol transitions 2015-08-12 20:33:17 +02:00
tumbili 04f55ce784 vtol fixes:
- mc pos control: publish attitude setpoint when vtol is in trans mode
- fw att control: do not publish attitude setpoint when in transition mode
- introduce flag in_transition_mode in vehicle status message for vtol
- improve tiltrotor code based on flight testing
2015-08-12 20:33:17 +02:00
Lorenz Meier ea7ae7d019 Merged beta into master 2015-08-01 16:58:02 +02:00
Lorenz Meier d94f2aa407 MC pos control: Use separate params for manual control 2015-07-22 17:12:43 +02:00
Lorenz Meier 033c512fbf Add separate params for manual throttle control 2015-07-22 17:12:43 +02:00
Lorenz Meier 116bd9a03e MC pos control: Code style fixes 2015-07-18 11:37:12 +02:00
Lorenz Meier 6088fbb9be Merge branch 'beta' 2015-07-05 13:48:16 +02:00
Lorenz Meier 2adb48ce90 MC pos control: Better default velocity gain. 2015-07-05 13:48:07 +02:00
Lorenz Meier 234990fbe4 Merge branch 'release_v1.0.0' of github.com:PX4/Firmware 2015-07-02 01:00:06 +02:00
Lorenz Meier 5982eaaf34 MC pos control: Enforce minimum throttle in manual attitude control mode only if not landed, else default to idle throttle 2015-06-30 09:51:03 +02:00
Lorenz Meier abbbfdfcee mc pos control: Fix params and descriptions 2015-06-30 07:10:13 +02:00
Lorenz Meier b72ac1428c Merge pull request #2481 from PX4/mc_yawfix
MC yawfix
2015-06-28 23:29:57 +02:00
Lorenz Meier 064c02a817 MC controller: Update use to new uORB API 2015-06-30 15:46:40 +02:00
Lorenz Meier 50ba1f7365 merged release_v1.0.0 into master 2015-06-30 15:30:45 +02:00
Lorenz Meier ba68b70b0b MC pos control: Comment style fixes 2015-06-27 10:53:00 +02:00
Lorenz Meier 0fe01f6eb8 MC pos control: Fix manual yaw handling to not reset yaw in extreme angle conditions 2015-06-27 10:17:15 +02:00
tumbili dcb680f9d6 VTOL: only publish attitude setpoint if in correct mode 2015-06-25 22:08:52 +02:00
Lorenz Meier 454becdae5 Merged release_v1.0.0 branch into master 2015-06-25 21:45:17 +02:00
Lorenz Meier 426b961abd MC pos control: Fix mavlink output 2015-06-22 09:58:40 +02:00
Lorenz Meier 2c2a6b710c MC position controller: Set better defaults 2015-06-21 19:00:23 +02:00
Lorenz Meier 3cd211ed72 MC pos control: Do not raise min throttle too far. 2015-06-18 08:56:00 +02:00
Lorenz Meier 460c6bcf57 MC att control demand: Require a higher minimum throttle 2015-06-15 21:56:44 +02:00
Lorenz Meier 2fd4c5240f Merge pull request #2341 from PX4/mc_offb_vel_limit
Multicopter offboard velocity limit
2015-06-14 12:53:19 +02:00
Lorenz Meier c9fefe236b Merged release into master 2015-06-13 11:06:01 +02:00
Lorenz Meier 267fb408b1 Update MC thrust limit default param value and add explanation 2015-06-12 11:08:30 +02:00
James Goppert dedd16e36e Modified velocity saturation to maintain direction. 2015-06-12 10:58:33 +02:00