fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 22:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,566 Commits 852 Branches 161 Tags
689536893caea0cde8cafb3a51cd7e471338cfb0
Commit Graph
507 Commits
Author SHA1 Message Date
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Lorenz Meier 3e3a64f0ed Merge branch 'master' of github.com:PX4/Firmware into ekf_params 2014-05-09 21:36:43 +02:00
Lorenz Meier e18bdfdf65 Merge pull request #858 from TickTock-/rc_merged 
Rc merged
 2014-05-08 23:21:22 -07:00
Julian Oes 26f5e550c4 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params 
Conflicts:
	src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
 2014-05-07 21:11:21 +02:00
Lorenz Meier 6a6feaf96c Merged master 2014-05-07 14:14:31 +02:00
Lorenz Meier 2d38d113e1 Fix MAVLink to use info warn level for text messages 2014-05-07 14:12:48 +02:00
Lorenz Meier 1d6b9fae03 Fix in-air restarts, protect against an external MAVLink sender exploiting the restart mechanism 2014-05-06 14:57:06 +02:00
Lorenz Meier df6a0d5a1a mavlink: Only send the distance sensor message if the topic actually updates 2014-05-06 12:55:39 +02:00
Lorenz Meier 6351fd1e2c Added debug printfs 2014-05-05 13:48:05 +02:00
Lorenz Meier 2e1dae2a7f Merge branch 'master' into mavlink-ftp 2014-05-05 07:14:32 +02:00
px4dev ef7c57f1ce Implement directory listing 2014-05-04 12:25:25 -07:00
px4dev 12390d7281 WIP: Mavlink file server 2014-05-04 11:19:26 -07:00
Thomas Gubler 5f786af8fa mavlink: status is a pointer 2014-05-04 15:02:37 +02:00
Thomas Gubler 0e31b5935e remove trailing whitespace 2014-05-04 15:02:30 +02:00
Lorenz Meier ee580206b4 mavlink: Only sending HIL control commands if the system is actually armed 2014-05-04 14:06:38 +02:00
Anton Babushkin f6d61dfb4c mavlink: swap x and y when handling MANUAL_CONTROL mavlink message 2014-05-01 23:45:21 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
Julian Oes e882824ee1 eph and epv renaming, make this compile again 2014-04-26 23:31:15 +02:00
Julian Oes e8531e8360 Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
	src/modules/navigator/navigator_main.cpp
	src/modules/uORB/topics/vehicle_global_position.h
 2014-04-26 23:08:11 +02:00
Lorenz Meier 22d3bcdab6 Merged mpc_rc into ekf_params 2014-04-26 15:13:03 +02:00
Julian Oes db5266d3df Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 11:59:33 +02:00
Anton Babushkin 0c1de81785 Merge branch 'master' into mpc_rc 2014-04-25 21:39:59 +02:00
Anton Babushkin db474072a7 Merge branch 'rc_timeout' into mpc_rc 2014-04-23 19:03:03 +02:00
Thomas Gubler d7d6a3d3b7 filter gps simulation hil gps message with sysid 2014-04-23 16:26:44 +02:00
Thomas Gubler a2940182ef add parameter to mavlink app to allow parsing of HIL GPS message even if not in HIL mode 
Conflicts:
	src/modules/mavlink/mavlink_receiver.cpp
 2014-04-23 15:53:48 +02:00
Anton Babushkin 2998685a3a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 14:22:52 +02:00
Anton Babushkin e4a4430f9f Merge branch 'master' into rc_timeout 2014-04-22 11:18:07 +02:00
Anton Babushkin 302233a34f Merge branch 'master' into mpc_local_pos 2014-04-22 11:13:11 +02:00
Julian Oes fd56c15a20 Merge remote-tracking branch 'px4/master' into navigator_cleanup 
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_messages.cpp
	src/modules/mavlink/module.mk
	src/modules/sdlog2/sdlog2_messages.h
 2014-04-22 11:10:48 +02:00
Lorenz Meier 2ecaab98f9 Merge branch 'master' of github.com:PX4/Firmware into ekf_params 2014-04-22 09:58:07 +02:00
Lorenz Meier 42e9c84d50 Merge branch 'master' of github.com:PX4/Firmware into ekf_params 2014-04-22 01:40:27 +02:00
Lorenz Meier 815e221c1f mavlink: Start the same in HIL mode as in normal mode. Requires all HIL tools to run sh /etc/init.d/rc.usb now. Improve UART error handling 2014-04-22 01:23:55 +02:00
Julian Oes c3c0328e8b navigator: lot's of cleanup (WIP) 2014-04-21 17:36:59 +02:00
Anton Babushkin 1f2e972ea6 mavlink: remaining battery scaling fixed 2014-04-21 12:16:45 +02:00
Lorenz Meier 906abbcbb6 mavlink: Only write to TX buf if space is available. This is working around a NuttX issue where overflowing the TX buf leads to being unable to send any further data 2014-04-20 21:04:05 +02:00
Anton Babushkin 8634780e80 Merge branch 'master' into mpc_rc 2014-04-20 20:10:39 +02:00
Lorenz Meier 2ea32b315f Merged master 2014-04-20 02:04:05 +02:00
Julian Oes 654ab4635a navigator: wrong mission topic was copied, clearer naming of offboard mission now 2014-04-18 22:05:49 +02:00
Lorenz Meier fde2878413 mavlink: Change to size optimization 2014-04-18 22:05:48 +02:00
Helen Oleynikova ebf0678333 More whitespace all the time. 2014-04-18 22:05:48 +02:00
Helen Oleynikova d6647d841a More whitespace all the time. 2014-04-18 22:05:48 +02:00
Helen Oleynikova 7accde9b5b Whtespace. 2014-04-18 22:05:48 +02:00
Helen Oleynikova e35d4cd491 Reverted logging. 2014-04-18 22:05:48 +02:00
Helen Oleynikova ff2e4732a0 Indentation. 2014-04-18 22:05:48 +02:00
Helen Oleynikova e09aed917d Finished adding a '-w' option. 2014-04-18 22:05:47 +02:00
Helen Oleynikova 5c996065e2 Added vicon stream. 2014-04-18 22:05:47 +02:00
Julian Oes 665a2d6a92 mavlink and mission topic: added reading in DO_JUMP mission items 2014-04-18 22:05:47 +02:00
Lorenz Meier a96d83e4ec Revert "Merge pull request #816 from PX4/mavlink_commandlongstream" 
This reverts commit 00ef10f307, reversing
changes made to d55e64d1e5.
 2014-04-18 22:05:46 +02:00
Anton Babushkin 84aa96cf23 mavlink: minor comments and formatting fixes 2014-04-18 22:05:46 +02:00