fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 22:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,983 Commits 852 Branches 161 Tags
0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4
Commit Graph

307 Commits

Author SHA1 Message Date
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
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
Anton Babushkin 1f2e972ea6 mavlink: remaining battery scaling fixed 2014-04-21 12:16:45 +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 a4b10bab30 navigator: wrong mission topic was copied, clearer naming of offboard mission now 2014-04-18 11:15:40 +02:00
Lorenz Meier df987f3577 Merge pull request #822 from helenol/helen_mavlink_pull 
Added a -w option to mavlink, added vicon messages to stream.
 2014-04-13 23:39:27 +02:00
Lorenz Meier f846690395 Added rangefinder message to MAVLink app 2014-04-13 23:30:09 +02:00
Lorenz Meier 88357c58bd mavlink: Change to size optimization 2014-04-13 20:45:03 +02:00
Anton Babushkin 88149311ea Merge branch 'rc_timeout' into mpc_rc 2014-04-13 11:06:49 +04:00
Helen Oleynikova e7c8fdc586 More whitespace all the time. 2014-04-10 10:41:00 +02:00
Helen Oleynikova 8a946f0320 More whitespace all the time. 2014-04-10 10:37:58 +02:00
Helen Oleynikova e5105f6d91 Whtespace. 2014-04-10 10:35:30 +02:00
Helen Oleynikova dd88e319ee Reverted logging. 2014-04-10 10:33:10 +02:00
Helen Oleynikova 4f91fdb98c Indentation. 2014-04-10 10:30:00 +02:00
Helen Oleynikova e6542653b9 Finished adding a '-w' option. 2014-04-10 10:26:15 +02:00
Helen Oleynikova e99291d825 Added vicon stream. 2014-04-10 09:08:37 +02:00
Lorenz Meier 8e0e0c164a Merge branch 'mavlink_command' of github.com:PX4/Firmware 2014-04-08 21:41:05 +02:00
Lorenz Meier 27884e49be Revert "Merge pull request #816 from PX4/mavlink_commandlongstream" 
This reverts commit 00ef10f307, reversing
changes made to d55e64d1e5.
 2014-04-08 21:40:05 +02:00
Lorenz Meier 00ef10f307 Merge pull request #816 from PX4/mavlink_commandlongstream 
mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send mavlink_msg_command_long
 2014-04-08 21:38:32 +02:00
Anton Babushkin d55e64d1e5 mavlink: minor comments and formatting fixes 2014-04-08 23:29:40 +04:00
Anton Babushkin 09093b17da mavlink: commands stream implemented 2014-04-08 23:28:52 +04:00
Thomas Gubler f0d043c068 mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send mavlink_msg_command_long 2014-04-08 17:11:23 +02:00
Lorenz Meier 0930a3c1b6 Merge pull request #814 from PX4/mavlink_fd 
mavlink: accessor for _mavlink_fd
 2014-04-08 06:22:42 -07:00
Thomas Gubler 134633c7f0 mavlink: accessor for _mavlink_fd 2014-04-08 15:20:10 +02:00
Julian Oes fc2bfb828f Merge remote-tracking branch 'px4/master' into mavlink_broadcast 2014-04-07 21:45:45 +02:00
Julian Oes 38c3e68976 Send camera command to all, use own sysid 2014-04-07 21:44:01 +02:00
Julian Oes bb3792bcdd mavlink: use LL_FOREACH 2014-04-07 21:42:48 +02:00
Lorenz Meier e4628fbed6 Merge pull request #810 from thomasgubler/mavlink_setpoints 
mavlink: in normal mode transmit position setpoint and roll-pitch-yaw-thrust setpoint
 2014-04-07 08:11:23 -07:00
Anton Babushkin de3efc0975 mavlink: publish SYS_STATUS at constant rate, don't look at update() result 2014-04-07 17:17:56 +04:00
Thomas Gubler 536ff50fe1 mavlink: in normal mode transmit position setpoint and roll-pitch-yaw-thrust setpoint 2014-04-07 14:46:26 +02:00
Anton Babushkin c77a7b1162 mavlink_receiver: don't publish rc_channels on manual_control from mavlink, set switches to unmapped state instead of using previous values 2014-04-06 22:23:33 +04:00
Lorenz Meier e4cfdb4f9f mavlink: Add manual SP subscription 2014-04-06 19:34:32 +02:00
Anton Babushkin 7c4f1c90dc mavlink_receiver: fixed bug in manual control publication, minor refactoring 2014-04-06 14:57:45 +04:00
Julian Oes f17c0b1335 mavlink: implemented multicasting between mavlink instances (two options: forwarding: forward received messages from self to other mavlink instances, passing: send out messages received from other mavlink intances over serial 2014-04-03 21:15:47 +02:00
Anton Babushkin 5c53797c17 Merge branch 'master' into mpc_local_pos 2014-04-02 17:09:36 +04:00
Anton Babushkin fc757f9492 mavlink: is_published() fix 2014-04-02 15:38:49 +04:00
Anton Babushkin a991ebd8ca Merge branch 'master' into mpc_local_pos 2014-03-28 10:44:28 +04:00
Anton Babushkin 83da4ae02d 'vehicle_global_position' topic updated: removed baro_alt and XXX_valid flags. 2014-03-27 00:27:11 +04:00
Lorenz Meier 506c16f12a Bring fixed wing HIL back to normal mode, keep multicopter unchanged 2014-03-25 17:37:44 +01:00
Lorenz Meier 2c2c4af599 mavlink / HIL: Split handling of actuator feedback between fixed wing and multicopters 2014-03-25 12:21:07 +01:00
Lorenz Meier 5053575e2f Merge branch 'master' of github.com:PX4/Firmware into hil_range_fix 2014-03-25 12:08:58 +01:00
Lorenz Meier 57fdb40a4e mavlink: Hotfixed HIL battery status publication 2014-03-23 16:57:01 +01:00
Lorenz Meier 6c9a40b714 Fixed the HIL actuator range to what it should be 2014-03-23 14:34:15 +01:00