Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged master to gnss_rework | Lorenz Meier | 2014-07-02 | 1 | -1/+0 |
|\ | |||||
| * | Merge pull request #984 from PX4/rc_channels | Lorenz Meier | 2014-06-30 | 1 | -1/+0 |
| |\ | | | | | | | rc_channels cleanup | ||||
| | * | rc_channels topic cleanup | Anton Babushkin | 2014-05-20 | 1 | -1/+0 |
| | | | |||||
* | | | Merged upstream master, add missing change | Kynos | 2014-06-30 | 1 | -10/+10 |
| | | | |||||
* | | | Merged upstream master into gnss_rework branch | Kynos | 2014-06-30 | 1 | -373/+771 |
|\| | | |||||
| * | | Merged master | Lorenz Meier | 2014-06-29 | 1 | -2/+9 |
| |\ \ | |||||
| | * | | mavlink: spaces replaced with tabs | Anton Babushkin | 2014-06-26 | 1 | -4/+4 |
| | | | | |||||
| | * | | mavlink: init structs for HEARTBEAT if uORB topic copy failed | Anton Babushkin | 2014-06-26 | 1 | -2/+9 |
| | | | | |||||
| * | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -13/+15 |
| |\ \ \ | |||||
| | * | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 1 | -350/+594 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.h src/modules/mavlink/mavlink_messages.cpp | ||||
| | | * | | mavlink: Always send heartbeat and do not require both topics to update | Lorenz Meier | 2014-06-26 | 1 | -13/+15 |
| | | | | | |||||
| * | | | | Merge branch 'master' into navigator_rewrite_estimator | Lorenz Meier | 2014-06-23 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Hotfix: Move channel count to right position | Lorenz Meier | 2014-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merged rate config changes | Lorenz Meier | 2014-06-23 | 1 | -0/+120 |
| |\ \ \ \ | |||||
| | * | | | | mavlink: REQUEST_DATA_STREAM hadling implemented | Anton Babushkin | 2014-04-07 | 1 | -2/+110 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into navigator_rewrite_estimator | Lorenz Meier | 2014-06-23 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Hotfix: Fix message name typo | Lorenz Meier | 2014-06-23 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merged master | Lorenz Meier | 2014-06-22 | 1 | -361/+603 |
| |\| | | | | | |_|/ / | |/| | | | |||||
| | * | | | mavlink: sign of climb rate fixed in VFR_HUD message | Anton Babushkin | 2014-06-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into mavlink_stack | Anton Babushkin | 2014-06-12 | 1 | -6/+1 |
| | |\ \ \ | |||||
| | * | | | | MavlinkOrbSubscription API reworked | Anton Babushkin | 2014-06-11 | 1 | -112/+199 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into mavlink_stack | Anton Babushkin | 2014-06-10 | 1 | -2/+6 |
| | |\ \ \ \ | |||||
| | * | | | | | mavlink app: Finish porting all messages to new scheme | Lorenz Meier | 2014-05-16 | 1 | -645/+717 |
| | | | | | | | |||||
| | * | | | | | Converted streams to new API, saving a bunch of RAM | Lorenz Meier | 2014-05-16 | 1 | -170/+212 |
| | | | | | | | |||||
| | * | | | | | mavlink app: Clean up allocations | Lorenz Meier | 2014-05-16 | 1 | -941/+987 |
| | | | | | | | |||||
| * | | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
| * | | | | | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-11 | 1 | -8/+8 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | | | | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 1 | -33/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP) | ||||
| * | | | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 1 | -8/+12 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/gps/gps.cpp src/drivers/gps/mtk.cpp src/modules/commander/commander.cpp src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp src/modules/navigator/mission.cpp src/modules/navigator/mission.h src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_state.h src/modules/position_estimator_inav/position_estimator_inav_main.c | ||||
| * | | | | | | Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params | Julian Oes | 2014-05-07 | 1 | -16/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp | ||||
| * | | | | | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-22 | 1 | -1/+48 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 1 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | More whitespace all the time. | Helen Oleynikova | 2014-04-18 | 1 | -67/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | More whitespace all the time. | Helen Oleynikova | 2014-04-18 | 1 | -90/+90 |
| | | | | | | | | | |||||
| * | | | | | | | | Added vicon stream. | Helen Oleynikova | 2014-04-18 | 1 | -0/+42 |
| | | | | | | | | | |||||
| * | | | | | | | | Revert "Merge pull request #816 from PX4/mavlink_commandlongstream" | Lorenz Meier | 2014-04-18 | 1 | -46/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00ef10f307d3c4a262a15ab5747d854eb4c568d5, reversing changes made to d55e64d1e54542762510387a22897f504c68a5a6. | ||||
| * | | | | | | | | mavlink: minor comments and formatting fixes | Anton Babushkin | 2014-04-18 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | mavlink: COMMAND_LONG stream: listen to vehicle_command uorb topic and send ↵ | Thomas Gubler | 2014-04-18 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mavlink_msg_command_long | ||||
| * | | | | | | | | Send camera command to all, use own sysid | Julian Oes | 2014-04-18 | 1 | -4/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | mavlink: publish SYS_STATUS at constant rate, don't look at update() result | Anton Babushkin | 2014-04-18 | 1 | -16/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | mavlink: implemented multicasting between mavlink instances (two options: ↵ | Julian Oes | 2014-04-18 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forwarding: forward received messages from self to other mavlink instances, passing: send out messages received from other mavlink intances over serial | ||||
* | | | | | | | | | Merge master with the exception of ubx.cpp and ubx.h | Kynos | 2014-06-15 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | mavlink: put update call back in | Julian Oes | 2014-06-10 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | mavlink: report global position setpoint and do this always no just when ↵ | Julian Oes | 2014-06-10 | 1 | -8/+6 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | updated, otherwise the values are not visible in QGC | ||||
| * | | | | | | | Hotfix: Fix scaling for battery current | Lorenz Meier | 2014-06-03 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* / | | | | | | U-blox driver rework, step 2 | Kynos | 2014-05-30 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved satellite info from vehicle_gps_position_s into a new uORB topic satellite_info. Renamed satellites_visible to satellites_used to reflect true content. sdlog2 will log info for GPS satellites only for now. |