Commit Graph

94 Commits

Author SHA1 Message Date
Johan Jansen 9cc94fcb2d mc_pos_control: Protect against NaN and Inf setpoints 2015-01-26 13:58:19 +01:00
Lorenz Meier 9b535f6553 Merge pull request #1465 from PX4/mcposoffbaltitude
MC pos control offb: read altitude sp separately
2014-12-25 00:26:59 +01:00
Lorenz Meier 4c281030bb position controller main: Less verbose 2014-11-22 16:34:35 +01:00
Lorenz Meier a36088b9c2 INAV: use int for outputs 2014-11-22 16:32:05 +01:00
Thomas Gubler 30d8512846 MC pos control offb: read altitude sp separately 2014-11-19 12:31:04 +01:00
Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
2014-10-05 13:17:32 +02:00
Anton Babushkin 84908f8f3d mc_pos_control: AUTO speed limiting bug fixed 2014-10-02 15:45:02 +04:00
Anton Babushkin 2d81c2cf46 mc_pos_control: commented code block removed 2014-09-28 13:43:42 +04:00
Anton Babushkin 132c9180ea mc_pos_control: move position offset limiting to separate method 2014-09-01 18:47:56 +02:00
Anton Babushkin 8ad1aa789b mc_pos_control: reset position setpoint on entering to AUTO mode 2014-09-01 18:13:29 +02:00
Thomas Gubler 9bda573151 mc pos control: offboard: set yaw and yawspeed depending on valid flags 2014-08-25 13:15:30 +02:00
Anton Babushkin f31c3243b0 mc_pos_control: navigation fixes, smooth position setpoint movements 2014-08-17 23:28:48 +02:00
Anton Babushkin fc0bdfb6f5 mc_pos_control: trajectory following, using previous and next waypoints 2014-08-16 18:42:12 +02:00
Lorenz Meier 9ecec7fada Add default initializers and timestamp in local position 2014-08-10 01:30:25 +02:00
Anton Babushkin 03f839a27a mc_pos_control: more accurate position setpoint reset, keep attitude setpoint continuous 2014-08-08 00:24:18 +02:00
Anton Babushkin faaeaeb113 mc_pos_control: manual and offboard control reorganization and cleanup 2014-08-08 00:22:57 +02:00
Anton Babushkin f7582b4d00 Merge branch 'master' into smooth_pos_hold 2014-08-02 22:11:57 +02:00
Lorenz Meier 0d0c4c3626 mc pos control: Fix reordering warnings 2014-07-08 09:57:25 +02:00
Julian Oes 73d6121a9d Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/uORB/topics/rc_channels.h
2014-07-02 15:15:26 +02:00
Anton Babushkin b9e2fa2c0d mc_pos_control: compiler warning fix 2014-06-30 12:03:48 +02:00
Don Gagne 92adbe9216 Fix compiler warnings 2014-06-29 17:47:24 -07:00
Julian Oes ee872d91b0 mc_pos_control: read velocity setpoints form offboard control and do position offset control 2014-06-27 12:55:27 +02:00
Julian Oes 98fffe6107 mc_pos_control: added missing subscribe 2014-06-27 12:54:00 +02:00
t0ni0 9d18da4433 Adds NaN checks and setpoint resets for offboard posctl 2014-06-18 16:45:38 -04:00
t0ni0 e078ef992f Removed publications closing
This is an attempt to correct the offboard setpoints being passed on as "NaN" values
2014-06-17 13:30:45 -04:00
Benjamin O'Connell-Armand 670d8c91e9 Merge branch 'offboard2' of https://github.com/elikos/Firmware into offboard2 2014-06-14 15:50:24 -04:00
Benjamin O'Connell-Armand 128ec447ad Fix various compilation issue 2014-06-14 15:50:21 -04:00
andre-nguyen 02653f6cd9 Merge branch 'offboard2' of github.com:elikos/Firmware into offboard2 2014-06-14 15:27:26 -04:00
andre-nguyen 6cf890b46b indentation and fix commander flags. It's impossible to control position at the same time as attitude so we have to disable some things. My logic is that all the control flags for position control should be opposite of the attitude control mode. 2014-06-14 15:27:07 -04:00
t0ni0 7d05f2df7c Added support for velocity setpoint in mavlink_receiver and mc_pos_control 2014-06-13 20:38:43 -04:00
t0ni0 d9b5efb263 Closed additional file descriptor 2014-06-09 19:09:38 -04:00
t0ni0 0a86fd0d9f Changed struct name used for local_pos_sp 2014-06-08 15:22:04 -04:00
t0ni0 2a79a9a4e4 Close fds when not needed
File descriptors get closed when not needed by offboard mode
to allow position and attitude controllers to advertise and publish.
2014-06-07 12:31:50 -04:00
t0ni0 af56879fdd Removed duplicate _pos_sp assignation 2014-06-04 02:32:44 -04:00
andre-nguyen 915ed5aa1f had the wrong setpoint structure 2014-06-04 00:06:55 -04:00
andre-nguyen abbf57dac6 had the wrong variable and wrong setpoint type 2014-06-04 00:04:31 -04:00
t0ni0 f1b6a3f44f Fixed offboard_control_pos_sp to be passed to _pos_sp vector. Added checks for position and altitude control modes. 2014-06-03 23:55:21 -04:00
andre-nguyen 55cf19b082 added support for offboard position setpoint in mc_pos_control 2014-06-03 21:45:29 -04:00
Lorenz Meier 32f0b2c422 mc_pos_control: Reduce stack mildly by 50 bytes 2014-05-15 07:30:03 +02:00
Lorenz Meier 05f9336d20 mc_pos_control: Code style fixes in comments 2014-05-15 07:28:18 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler 2999182952 mc pos control: use new manual control setpoint variable names 2014-05-12 09:24:22 +02:00
Lorenz Meier 88194c5971 Remove noreturn attribute from all apps that actually can return 2014-05-09 09:20:08 +02:00
Lorenz Meier e18bdfdf65 Merge pull request #858 from TickTock-/rc_merged
Rc merged
2014-05-08 23:21:22 -07:00
Anton Babushkin 7232c0354b mc_pos_control: use MPC_XXX_FF to adjust setpoint on reset 2014-05-01 23:01:30 +02:00
Anton Babushkin f4c36f8c5c mc_pos_control: use current velocity to calculate position setpoint on reset to make transition to stabilized modes more smooth 2014-05-01 20:57:36 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
Anton Babushkin 4378454a10 mc_pos_control: hotfix, MPC_TILTMAX_AIR and MPC_TILTMAX_LND parameters fixed 2014-04-28 17:49:57 +02:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
Lorenz Meier 08408594ec Renamed parameters which changed from RAD to DEGREES to avoid user confusion. Also made naming of the two parameters more consistent. 2014-04-27 16:06:34 +02:00