Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-12 | 2 | -4/+6 |
|\ | | | | | | | | | | | | | 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 | ||||
| * | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 1 | -4/+4 |
| | | |||||
| * | Merge pull request #858 from TickTock-/rc_merged | Lorenz Meier | 2014-05-08 | 1 | -4/+4 |
| |\ | | | | | | | Rc merged | ||||
| | * | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 1 | -4/+4 |
| | | | |||||
| | * | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 1 | -4/+4 |
| | | | |||||
| * | | Fix MAVLink to use info warn level for text messages | Lorenz Meier | 2014-05-07 | 1 | -0/+2 |
| | | | |||||
* | | | mavlink receiver: use new manual control setpoint variable names and fix ↵ | Thomas Gubler | 2014-05-12 | 1 | -4/+4 |
| | | | | | | | | | | | | sending of manual control setpoint mavlink message | ||||
* | | | mavlink receiver: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -5/+5 |
|/ / | |||||
* | | Fix in-air restarts, protect against an external MAVLink sender exploiting ↵ | Lorenz Meier | 2014-05-06 | 1 | -0/+6 |
| | | | | | | | | the restart mechanism | ||||
* | | mavlink: Only send the distance sensor message if the topic actually updates | Lorenz Meier | 2014-05-06 | 1 | -12/+13 |
| | | |||||
* | | mavlink: status is a pointer | Thomas Gubler | 2014-05-04 | 1 | -1/+1 |
| | | |||||
* | | remove trailing whitespace | Thomas Gubler | 2014-05-04 | 1 | -1/+1 |
| | | |||||
* | | mavlink: Only sending HIL control commands if the system is actually armed | Lorenz Meier | 2014-05-04 | 1 | -4/+4 |
| | | |||||
* | | mavlink: swap x and y when handling MANUAL_CONTROL mavlink message | Anton Babushkin | 2014-05-01 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-25 | 4 | -5/+34 |
|\ | |||||
| * | filter gps simulation hil gps message with sysid | Thomas Gubler | 2014-04-23 | 1 | -1/+1 |
| | | |||||
| * | add parameter to mavlink app to allow parsing of HIL GPS message even if not ↵ | Thomas Gubler | 2014-04-23 | 4 | -5/+34 |
| | | | | | | | | | | | | | | in HIL mode Conflicts: src/modules/mavlink/mavlink_receiver.cpp | ||||
* | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-23 | 1 | -0/+5 |
|\ \ | |||||
| * | | Merge branch 'master' into rc_timeout | Anton Babushkin | 2014-04-22 | 8 | -34/+530 |
| |\| | |||||
| | * | mavlink: Start the same in HIL mode as in normal mode. Requires all HIL ↵ | Lorenz Meier | 2014-04-22 | 1 | -0/+5 |
| | | | | | | | | | | | | tools to run sh /etc/init.d/rc.usb now. Improve UART error handling | ||||
* | | | Merge branch 'mpc_local_pos' into mpc_rc | Anton Babushkin | 2014-04-23 | 3 | -2/+50 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-22 | 9 | -66/+555 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mavlink: remaining battery scaling fixed | Anton Babushkin | 2014-04-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merged master | Lorenz Meier | 2014-04-20 | 4 | -10/+79 |
| | |\ \ | |||||
| | * | | | Added rangefinder message to MAVLink app | Lorenz Meier | 2014-04-13 | 3 | -0/+50 |
| | | | | | |||||
* | | | | | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-20 | 8 | -34/+477 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | navigator: wrong mission topic was copied, clearer naming of offboard ↵ | Julian Oes | 2014-04-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | mission now | ||||
| * | | | | Merge pull request #822 from helenol/helen_mavlink_pull | Lorenz Meier | 2014-04-13 | 4 | -8/+77 |
| |\ \ \ \ | | | | | | | | | | | | | Added a -w option to mavlink, added vicon messages to stream. | ||||
| | * | | | | More whitespace all the time. | Helen Oleynikova | 2014-04-10 | 1 | -67/+67 |
| | | | | | | |||||
| | * | | | | More whitespace all the time. | Helen Oleynikova | 2014-04-10 | 2 | -93/+93 |
| | | | | | | |||||
| | * | | | | Whtespace. | Helen Oleynikova | 2014-04-10 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Reverted logging. | Helen Oleynikova | 2014-04-10 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Indentation. | Helen Oleynikova | 2014-04-10 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Finished adding a '-w' option. | Helen Oleynikova | 2014-04-10 | 3 | -13/+40 |
| | | | | | | |||||
| | * | | | | Added vicon stream. | Helen Oleynikova | 2014-04-10 | 1 | -0/+42 |
| | | |/ / | | |/| | | |||||
| * / | | | mavlink: Change to size optimization | Lorenz Meier | 2014-04-13 | 1 | -0/+2 |
| |/ / / | |||||
| * | | | Merge branch 'mavlink_command' of github.com:PX4/Firmware | Lorenz Meier | 2014-04-08 | 4 | -1/+146 |
| |\ \ \ | |||||
| | * | | | mavlink: commands stream implemented | Anton Babushkin | 2014-04-08 | 4 | -1/+146 |
| | | | | | |||||
| * | | | | Revert "Merge pull request #816 from PX4/mavlink_commandlongstream" | Lorenz Meier | 2014-04-08 | 1 | -46/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00ef10f307d3c4a262a15ab5747d854eb4c568d5, reversing changes made to d55e64d1e54542762510387a22897f504c68a5a6. | ||||
| * | | | | Merge pull request #816 from PX4/mavlink_commandlongstream | Lorenz Meier | 2014-04-08 | 1 | -0/+46 |
| |\ \ \ \ | | | | | | | | | | | | | mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send mavlink_msg_command_long | ||||
| | * | | | | mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send ↵ | Thomas Gubler | 2014-04-08 | 1 | -0/+46 |
| | |/ / / | | | | | | | | | | | | | | | | mavlink_msg_command_long | ||||
| * / / / | mavlink: minor comments and formatting fixes | Anton Babushkin | 2014-04-08 | 2 | -3/+1 |
| |/ / / | |||||
| * | | | Merge pull request #814 from PX4/mavlink_fd | Lorenz Meier | 2014-04-08 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | | | mavlink: accessor for _mavlink_fd | ||||
| | * | | | mavlink: accessor for _mavlink_fd | Thomas Gubler | 2014-04-08 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'px4/master' into mavlink_broadcast | Julian Oes | 2014-04-07 | 5 | -48/+48 |
| |\| | | | |||||
| | * | | | Merge pull request #810 from thomasgubler/mavlink_setpoints | Lorenz Meier | 2014-04-07 | 1 | -0/+2 |
| | |\ \ \ | | | | | | | | | | | | | mavlink: in normal mode transmit position setpoint and roll-pitch-yaw-thrust setpoint | ||||
| | | * | | | mavlink: in normal mode transmit position setpoint and roll-pitch-yaw-thrust ↵ | Thomas Gubler | 2014-04-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | setpoint | ||||
| | * | | | | mavlink: publish SYS_STATUS at constant rate, don't look at update() result | Anton Babushkin | 2014-04-07 | 1 | -16/+15 |
| | |/ / / | |||||
| * | | | | Send camera command to all, use own sysid | Julian Oes | 2014-04-07 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | mavlink: use LL_FOREACH | Julian Oes | 2014-04-07 | 1 | -5/+3 |
| | | | | |