Commit Graph

16111 Commits

Author SHA1 Message Date
Anton Babushkin 18eefa9dca Merge branch 'mpc_fix' into vector_control2 2013-12-13 17:26:41 +04:00
Anton Babushkin 6705e9518b Merge branch 'master' into vector_control2 2013-12-13 17:26:07 +04:00
Andrew Tridgell 5b7d1af5d8 Merged crccheck command 2013-12-13 11:22:14 +01:00
Andrew Tridgell 6016fbe55d Merged PX4IO crc checks and force update 2013-12-13 11:21:00 +01:00
Thomas Gubler c033443208 px4iofirmware: improve check for rc controlled channels in manual mode 2013-12-11 16:58:11 +01:00
Thomas Gubler b69097df38 px4io frimware: improve handling of manual mode when fmu is still healthy, use data from fmu for channels which are not controlled by rc 2013-12-11 16:58:03 +01:00
Thomas Gubler 2761d47be2 disable printf 2013-12-09 15:18:10 +01:00
Thomas Gubler edd1f4dbb8 set parachute deployed to 0 and handle correct scaling in mixer 2013-12-09 09:08:41 +01:00
Thomas Gubler 5e273bf225 px4iofirmware: in manual mode: ignore control indices which are not controlled by the rmeote control 2013-12-08 21:35:16 +01:00
Thomas Gubler 86aa2f85cb px4iofirmware: in manual mode: ignore control indices which are not controlled by the rmeote control 2013-12-08 21:34:49 +01:00
Thomas Gubler c16c57c9d0 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups 2013-12-08 18:57:53 +01:00
Thomas Gubler 278e05e425 added simple flight termination state machine which enbales parachute on request 2013-12-08 16:52:41 +01:00
Lorenz Meier 0ba507b640 Added support for a total of four control groups to the IO driver and IO firmware. This allows to run auxiliary payload. Cleaned up defines for RC input channel counts, this needs another sweep to then finally allow up to 16 mapped channels and up to 20-24 RAW RC channels 2013-12-08 11:25:45 +01:00
Anton Babushkin 5397f13b50 Merge branch 'master' into hil_fixes 2013-12-07 22:29:45 +04:00
Thomas Gubler b86161dd45 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator
Conflicts:
	src/modules/mavlink/missionlib.c
	src/systemcmds/tests/module.mk
2013-12-05 10:53:41 +01:00
Thomas Gubler f73988cee9 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator 2013-12-05 10:50:41 +01:00
Julian Oes 0aeada16b9 Navigator: handle onboard and mavlink missions 2013-12-04 10:38:56 +01:00
Julian Oes 56834414f1 Dataman: Also reserve space for onboard missions 2013-12-04 10:37:51 +01:00
Julian Oes 03a5426001 Merge branch 'fw_autoland_att_tecs_navigator' into bottle_drop_navigator
Conflicts:
	src/modules/navigator/navigator_main.cpp
2013-12-03 20:50:52 +01:00
Julian Oes e034f5135e Dataman: Some minor fixes 2013-12-03 16:25:46 +01:00
Julian Oes 83b09614e7 Dataman: Start dataman and use it in waypoints and navigator instead of mission items in mission topic 2013-12-03 16:25:11 +01:00
Julian Oes f2c303679e Bottle drop: lots of changes, working in HIL 2013-12-02 23:05:28 +01:00
Julian Oes 808294b01a HIL: only send attitude actuator group 0 2013-12-02 23:03:52 +01:00
Andrew Tridgell d0507296c0 px4io: moved blue heartbeat LED to main loop
this allows us to tell if the main loop is running by looking for a
blinking blue LED
2013-11-30 20:18:27 +11:00
Julian Oes 76e5a755df Bottle_drop: Publish to onboard mission 2013-11-29 17:03:18 +01:00
Julian Oes 07a3f5694c Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigator 2013-11-29 12:39:29 +01:00
Juchli D 3c2133b9f1 Working with faked imputs 2013-11-29 12:36:42 +01:00
Julian Oes 5c83af3868 Navigator: Onboard missions supported in theory 2013-11-29 10:54:29 +01:00
Julian Oes 69888d28a5 Navigator: Added onboard mission (not usable yet) 2013-11-29 10:06:01 +01:00
Hyon Lim b3f1adc54b SO3 estimator code has been cleaned 2013-11-29 02:35:49 +09:00
Hyon Lim bcd745fb0d SO(3) estimator and quaternion receive by mavlink implemented 2013-11-29 02:05:15 +09:00
Thomas Gubler a635010117 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator 2013-11-28 09:15:07 +01:00
Anton Babushkin b9ea915136 multirotor_pos_control: set PID parameters on init 2013-11-27 23:09:05 +04:00
Anton Babushkin 3c027a8e4d Various HIL-related fixes 2013-11-27 23:04:49 +04:00
Julian Oes de36ccfff5 Navigator: report the current waypoint back 2013-11-27 17:00:27 +01:00
Julian Oes 81023fe5aa Navigator and mavlink: more mavlink cleanup and set current waypoint option support added 2013-11-27 16:17:44 +01:00
Julian Oes 3f25298798 Mavlink and navigator: Disable some functions in mavlink that are taken over by navigator, introduce topic to report mission status from commander back to mavlink 2013-11-27 09:27:08 +01:00
Thomas Gubler ea9fcaa27f update the commander to only use local pos for landing detection when on rotary wing
Conflicts:
	src/modules/commander/commander.cpp
2013-11-26 18:56:06 +01:00
Thomas Gubler b2ee78c218 fw_pos_ctrl: landing: audio output 2013-11-26 17:02:52 +01:00
Julian Oes 9c1a5be8e1 Navigator: Gotten rid of some warnings 2013-11-26 16:43:51 +01:00
Julian Oes 972ca7db8a Merge branch 'fw_autoland_att_tecs_navigator' of https://github.com/thomasgubler/Firmware_Private into fw_autoland_att_tecs_navigator 2013-11-26 15:55:09 +01:00
Julian Oes 8e1af68bfd Navigator: Added parameter for loiter radius 2013-11-26 15:54:19 +01:00
Thomas Gubler 254777d38a more fixes for the mavlink_fd in fw pos ctrl, this now enables mavlink output for landing 2013-11-26 15:49:59 +01:00
Thomas Gubler b66730b5a9 making sure the mavlink fd is open in fw pos ctrl 2013-11-26 15:38:53 +01:00
Julian Oes a989e79663 Navigator: Don't try to go to next WP or loiter after landing, just stay in landing mode 2013-11-26 15:25:27 +01:00
Thomas Gubler d294953be7 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator 2013-11-26 15:25:22 +01:00
Thomas Gubler 126b0567fe add safety check for orbit in navigator. Prevents issues with old qgc versions 2013-11-26 15:24:16 +01:00
Julian Oes 9a79ad4cdb Navigator: Use parameter for minium altitude when starting loiter 2013-11-26 15:08:43 +01:00
Julian Oes 92f7fb2732 Navigator: Added some mavlink debug output 2013-11-26 14:17:41 +01:00
Thomas Gubler a94ed67b3f update the commander to only use local pos for landing detection when on rotary wing 2013-11-26 13:47:37 +01:00