Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lsm303d: don't use DRDY when not on internal SPI bus | Andrew Tridgell | 2014-10-08 | 1 | -2/+4 |
| | | | | | | | external SPI bus does not have accel DRDY connected Conflicts: mavlink/include/mavlink/v1.0 | ||||
* | Merged master into st24 | Lorenz Meier | 2014-10-07 | 30 | -370/+1959 |
|\ | |||||
| * | Revert "Remove range command" | Thomas Gubler | 2014-10-07 | 1 | -5/+0 |
| | | | | | | | | This reverts commit c58d845339c0d09fc703a1c730d89a7a00990906. | ||||
| * | Remove range command | Lorenz Meier | 2014-10-07 | 1 | -0/+5 |
| | | |||||
| * | Remove unnecessary commands, unneeded output / resets | Lorenz Meier | 2014-10-07 | 1 | -12/+1 |
| | | |||||
| * | Code style fixes, no code changes | Lorenz Meier | 2014-10-07 | 1 | -69/+82 |
| | | |||||
| * | Changed to proper parser for SF02/F laser rangefinder | Lorenz Meier | 2014-10-07 | 3 | -75/+18 |
| | | |||||
| * | Updated and fixed parser for SF02/F laser sensor, test harness runs clean | Lorenz Meier | 2014-10-07 | 2 | -0/+194 |
| | | |||||
| * | Merge pull request #1151 from PX4/offboard2_externalsetpointmessages | Lorenz Meier | 2014-10-07 | 17 | -240/+571 |
| |\ | | | | | | | Offboard2: Handle external setpoint messages | ||||
| | * | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-10-05 | 4 | -8/+12 |
| | |\ | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-10-05 | 95 | -1265/+5916 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp | ||||
| | * | | | mc pos control: offboard: set yaw and yawspeed depending on valid flags | Thomas Gubler | 2014-08-25 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | support new yaw and yawrate fields in mavlnk position_target message | Thomas Gubler | 2014-08-25 | 3 | -5/+54 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-25 | 22 | -204/+947 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-22 | 5 | -17/+21 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * | | | | | set_attitude_target msg: convert quaternion to R | Thomas Gubler | 2014-08-21 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-21 | 11 | -19/+840 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| | * | | | | | | navigator: remove offboard mode | Thomas Gubler | 2014-08-19 | 5 | -230/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard setpoints are now forwarded directly from mavlink | ||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-19 | 8 | -30/+26 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-18 | 2 | -2/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/mavlink/mavlink_main.cpp | ||||
| | * | | | | | | | | offboard: ignore mask cleanup | Thomas Gubler | 2014-08-15 | 2 | -19/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add handling of thrust ignore bit, add defines for the bitnumbers, improve and fix interface to ignore bitmask | ||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-15 | 2 | -14/+19 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Thomas Gubler | 2014-08-13 | 18 | -56/+707 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/mavlink/mavlink_receiver.cpp | ||||
| | * | | | | | | | | | | offboard sp: correctly map acceleration/force in combined setpoint to ↵ | Thomas Gubler | 2014-08-12 | 3 | -12/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setpoint triple Conflicts: src/modules/uORB/topics/position_setpoint_triplet.h | ||||
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-12 | 1 | -7/+29 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * | | | | | | | | | | | offboard setpoints: correctly check for force setpoint | Thomas Gubler | 2014-08-12 | 2 | -1/+35 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-11 | 57 | -1733/+2559 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/mavlink/mavlink_main.cpp src/modules/mavlink/mavlink_main.h src/modules/mavlink/mavlink_receiver.cpp | ||||
| | * | | | | | | | | | | | | mavlink external sp: support for local pos and vel | Thomas Gubler | 2014-07-23 | 2 | -3/+45 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-23 | 56 | -533/+1995 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/mavlink/mavlink_main.cpp | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-17 | 60 | -189/+1131 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * | | | | | | | | | | | | | | support force setpoints | Thomas Gubler | 2014-07-17 | 5 | -4/+39 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | att external sp: also write quaternion | Thomas Gubler | 2014-07-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | external attitude sp: set timestamp | Thomas Gubler | 2014-07-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | once offboard is set by mavlink command ignore RC mode | Thomas Gubler | 2014-07-16 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | mavlink receiver: fix copy paste error | Thomas Gubler | 2014-07-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | mavlink external sp: accept 0 sysid and compid | Thomas Gubler | 2014-07-15 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * | | | | | | | | | | | | | | | add parsing of external attitude message | Thomas Gubler | 2014-07-15 | 3 | -2/+93 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | mavlink: external setpoint feed trough functionality | Thomas Gubler | 2014-07-14 | 4 | -6/+40 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | commander: handle VEHICLE_CMD_NAV_GUIDED_ENABLE | Thomas Gubler | 2014-07-14 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | vehicle command: add latest guided commands | Thomas Gubler | 2014-07-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-14 | 93 | -1622/+3956 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages | ||||
| | * | | | | | | | | | | | | | | | | fix merge errors in offboard.cpp | Thomas Gubler | 2014-07-08 | 1 | -8/+11 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | remove comment | Thomas Gubler | 2014-07-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-08 | 31 | -576/+1146 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/navigator/offboard.cpp | ||||
| | * | | | | | | | | | | | | | | | | | WIP, change uorb offboard control sp topic | Thomas Gubler | 2014-07-07 | 3 | -39/+55 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-07-07 | 28 | -174/+345 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/commander/commander.cpp | ||||
| | * | | | | | | | | | | | | | | | | | | parsing of MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL | Thomas Gubler | 2014-07-03 | 1 | -2/+32 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | uorb offboard control topic: add force sp flag | Thomas Gubler | 2014-07-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag has the same meaning as bit 10 of type_mask in MAVLINK_MSG_ID_LOCAL_NED_POSITION_SETPOINT_EXTERNAL | ||||
| | * | | | | | | | | | | | | | | | | | | check sysid and compid for external setpoint | Thomas Gubler | 2014-07-03 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | |