Commit Graph

1588 Commits

Author SHA1 Message Date
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
Anton Babushkin 839fa1371d mavlink: commands stream implemented 2014-04-18 22:05:46 +02:00
Thomas Gubler b2bc8c1f08 mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send mavlink_msg_command_long 2014-04-18 22:05:46 +02:00
Thomas Gubler 1c49f132a4 mavlink: accessor for _mavlink_fd 2014-04-18 22:05:46 +02:00
Julian Oes d662fa4c14 Send camera command to all, use own sysid 2014-04-18 22:05:46 +02:00
Julian Oes 01d9d482c3 mavlink: use LL_FOREACH 2014-04-18 22:05:45 +02:00
Anton Babushkin a66dcbf7e9 mavlink: publish SYS_STATUS at constant rate, don't look at update() result 2014-04-18 22:05:45 +02:00
Thomas Gubler 2cd4648a8e mavlink: in normal mode transmit position setpoint and roll-pitch-yaw-thrust setpoint 2014-04-18 22:05:45 +02:00
Julian Oes 15defeb0f1 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-18 22:05:45 +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