Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | * | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-23 | 3 | -32/+34 | |
| | | | | |\| | ||||||
| | | | | | * | commander: don't start RTL on failsafe if landed | Anton Babushkin | 2014-04-23 | 1 | -3/+8 | |
| | | | | | * | Merge branch 'master' into rc_timeout | Anton Babushkin | 2014-04-22 | 232 | -314/+10920 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #850 from PX4/mavlink_startup_cleanup | Lorenz Meier | 2014-04-22 | 2 | -29/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | mavlink: Start the same in HIL mode as in normal mode. Requires all HIL tools... | Lorenz Meier | 2014-04-22 | 2 | -29/+26 | |
| | |/ / / / / | |/| | | | | | ||||||
| | | | | * | | navigator: merging bug fixed | Anton Babushkin | 2014-04-23 | 1 | -0/+3 | |
| | | | | * | | Merge branch 'mpc_local_pos' into mpc_rc | Anton Babushkin | 2014-04-23 | 1 | -0/+7 | |
| | | | | |\ \ | ||||||
| | | | | | * | | navigator: check if mission reached on vehicle_status updates | Anton Babushkin | 2014-04-23 | 1 | -0/+7 | |
| | | | | * | | | Merge branch 'mpc_local_pos' into mpc_rc | Anton Babushkin | 2014-04-23 | 14 | -55/+118 | |
| | | | | |\| | | ||||||
| | | | | | * | | navigator: publish global_position_setpoint on vehicle_status updates | Anton Babushkin | 2014-04-23 | 1 | -1/+4 | |
| | | | | | * | | sdlog2: add failsafe state logging | Anton Babushkin | 2014-04-22 | 2 | -1/+3 | |
| | | | | | * | | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-22 | 250 | -534/+11429 | |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | Revert "HIL: Increased MAVLink link wait time based on previous experience th... | Lorenz Meier | 2014-04-22 | 1 | -2/+1 | |
* | | | | | | | | Merge pull request #854 from jean-m-cyr/master | Lorenz Meier | 2014-04-22 | 2 | -3/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Reduce data manager SD card wear and tear | Jean Cyr | 2014-04-22 | 2 | -3/+18 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #853 from PX4/hil_batt_fix | Lorenz Meier | 2014-04-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | commander: Also publish battery status in HIL, since we have a fake battery a... | Lorenz Meier | 2014-04-22 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #848 from PX4/lpos_logfix | Lorenz Meier | 2014-04-22 | 1 | -24/+24 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed LPOS message in log, added ground flags field | Lorenz Meier | 2014-04-21 | 1 | -1/+1 | |
| * | | | | | | | | sdlog2: Fix indendation to expose length better, cut string lengths for exces... | Lorenz Meier | 2014-04-21 | 1 | -24/+24 | |
| * | | | | | | | | sdlog2: fix lpos labels string, shorten messages with excessive length | Lorenz Meier | 2014-04-21 | 1 | -3/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #851 from PX4/hil_hotfix | Lorenz Meier | 2014-04-22 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | HIL: Increased MAVLink link wait time based on previous experience that this ... | Lorenz Meier | 2014-04-22 | 1 | -1/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #844 from PX4/mavlink_batt_fix | Lorenz Meier | 2014-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | mavlink: remaining battery scaling fixed | Anton Babushkin | 2014-04-21 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | fw_config_fixes | Lorenz Meier | 2014-04-20 | 2 | -5/+5 | |
* | | | | | | Merge pull request #827 from PX4/mavlink_range_finder | Lorenz Meier | 2014-04-20 | 8 | -21/+67 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Merged master | Lorenz Meier | 2014-04-20 | 16 | -69/+192 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Merged master into mavlink_range_finder | Lorenz Meier | 2014-04-13 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Untangled local pos and distance messages, now sending distance messages only... | Lorenz Meier | 2014-04-13 | 2 | -16/+7 | |
| * | | | | | | Added rangefinder message to MAVLink app | Lorenz Meier | 2014-04-13 | 3 | -0/+50 | |
| * | | | | | | Added fields to range finder clarifying sensor properties | Lorenz Meier | 2014-04-13 | 1 | -2/+9 | |
| | | | * | | | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-20 | 225 | -234/+10782 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #820 from PX4/filter_nan_guard | Lorenz Meier | 2014-04-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | pauls estimator: Added NaN guard before publishing | Lorenz Meier | 2014-04-09 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #835 from TickTock-/blinkm_fix | Lorenz Meier | 2014-04-19 | 1 | -46/+95 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed blinkm state indication (was not properly reporting flight mode). Adde... | TickTock- | 2014-04-16 | 1 | -46/+95 | |
* | | | | | | | | | Merge pull request #829 from PX4/uploader_hotfix | Lorenz Meier | 2014-04-19 | 1 | -2/+7 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Hotfix to PX4IO uploader. There are no known mishaps due to it, but very clea... | Lorenz Meier | 2014-04-15 | 1 | -2/+7 | |
* | | | | | | | | | Merge pull request #838 from PX4/fix_mission_topic | Lorenz Meier | 2014-04-18 | 4 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | navigator: wrong mission topic was copied, clearer naming of offboard mission... | Julian Oes | 2014-04-18 | 4 | -7/+7 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #828 from PX4/cox_cleanup | Lorenz Meier | 2014-04-14 | 4 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | startup: cleanup of cox mixer files (Thanks Rune) | Julian Oes | 2014-04-14 | 4 | -3/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #822 from helenol/helen_mavlink_pull | Lorenz Meier | 2014-04-13 | 4 | -8/+77 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | 2 | -6/+6 | |
| * | | | | | | | Indentation. | Helen Oleynikova | 2014-04-10 | 1 | -8/+8 | |
| * | | | | | | | Reverted rcS | Helen Oleynikova | 2014-04-10 | 1 | -12/+4 |