Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_drton | Anton Babushkin | 2014-06-28 | 23 | -552/+835 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | navigator: NavigatorMode and MissionBlock API cleanup | Anton Babushkin | 2014-06-28 | 11 | -129/+144 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1142 from PX4/simon_test | Lorenz Meier | 2014-07-07 | 4 | -143/+510 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | EKF filter update | |||||
| * | | | | | | | | | | Update estimator | Lorenz Meier | 2014-07-03 | 2 | -16/+17 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into simon_test | Lorenz Meier | 2014-07-03 | 101 | -1255/+2070 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update estimator from Paul | Lorenz Meier | 2014-06-29 | 4 | -143/+509 | |
| | | | | | | | | | | | | ||||||
| | | | | | | | | | * | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 33 | -175/+423 | |
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp | |||||
* | | | | | | | | | | | | Merge pull request #1140 from DonLakeFlyer/UnusedVariableWarnings | Lorenz Meier | 2014-07-07 | 5 | -10/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Fix unused variable warnings | |||||
| * | | | | | | | | | | | Fix unused variable warnings | Don Gagne | 2014-07-06 | 5 | -10/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1133 from PX4/datalink_fix | Lorenz Meier | 2014-07-06 | 7 | -89/+161 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Telemetry status: use separate topic for each link | |||||
| * | | | | | | | | | | | sdlog2: TEL message format fixed | Anton Babushkin | 2014-07-06 | 1 | -4/+4 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | telemetry_statur: use 4 separate topics | Anton Babushkin | 2014-07-06 | 7 | -100/+166 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Commander: Only consider latest active data link heartbeat for timeout. | Antonio Sanniravong | 2014-07-04 | 1 | -12/+18 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1129 from PX4/roboclaw_test | Lorenz Meier | 2014-07-06 | 2 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move a seldomly used module to test config | |||||
| * | | | | | | | | | | | Move a seldomly used module to test config | Lorenz Meier | 2014-07-06 | 2 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1123 from DonLakeFlyer/Warnings | Lorenz Meier | 2014-07-06 | 8 | -34/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Compiler warning fixes | |||||
| * | | | | | | | | | | | Bring everything up to double | Don Gagne | 2014-07-06 | 1 | -12/+10 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Compiler warning fixes | Don Gagne | 2014-07-05 | 8 | -28/+33 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1135 from PX4/stack_fw_save | Lorenz Meier | 2014-07-06 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control apps | |||||
| * | | | | | | | | | | | Reduce excessive stack sizes for FW estimation / control apps | Lorenz Meier | 2014-07-06 | 2 | -2/+2 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1130 from PX4/pr-1130 | Lorenz Meier | 2014-07-06 | 4 | -5/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Fix IO Firmware build warnings | |||||
| * | | | | | | | | | | Fixes #1130 | px4dev | 2014-07-06 | 4 | -5/+8 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1117 from PX4/mavlink_stack_size | Lorenz Meier | 2014-07-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | mavlink: stack size for main thread increased | |||||
| * | | | | | | | | | | mavlink: stack size for main thread increased | Anton Babushkin | 2014-07-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1118 from PX4/hkmicropcb | Lorenz Meier | 2014-07-04 | 2 | -0/+33 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Hk micro pcb quad: Startup script | |||||
| * | | | | | | | | | micro pcb quad: remove unnecessary setting | Thomas Gubler | 2014-07-04 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | hk micro pcb quad startup script: add comment | Thomas Gubler | 2014-07-04 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into hkmicropcb | Thomas Gubler | 2014-07-04 | 9 | -36/+175 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1113 from Kynos/gnss_nav_pvt | Lorenz Meier | 2014-07-03 | 5 | -27/+122 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use NAV-PVT with ubx7 and ubx8 modules | |||||
| * | | | | | | | | | | Use NAV-PVT with ubx7 and ubx8 modules | Kynos | 2014-07-03 | 5 | -25/+113 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC. | |||||
| * | | | | | | | | | | Added NAV-TIMEUTC valid flag defines | Kynos | 2014-07-03 | 1 | -2/+9 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1114 from PX4/contributing | Lorenz Meier | 2014-07-03 | 1 | -0/+44 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Contributing notes | |||||
| * | | | | | | | | | Changed branch name suggestion | Lorenz Meier | 2014-07-03 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Contributing notes | Lorenz Meier | 2014-07-03 | 1 | -0/+44 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'est_reinit_fix' | Lorenz Meier | 2014-07-03 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | estimator: Fixed body / world matrix initialization and reset | Lorenz Meier | 2014-07-03 | 1 | -6/+6 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | hk micro pcb quad: change min pwm value | Thomas Gubler | 2014-07-03 | 1 | -2/+3 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into hkmicropcb | Thomas Gubler | 2014-07-03 | 28 | -822/+1283 | |
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | rc.autostart entry for hk micro pcb quad | Thomas Gubler | 2014-07-02 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | hk micro pcb startup script | Thomas Gubler | 2014-07-02 | 1 | -0/+27 | |
| | | | | | | | | | | ||||||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into offboard2_merge | Thomas Gubler | 2014-07-03 | 2 | -3/+3 | |
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #919 from TickTock-/hotfix_override_threshold | Lorenz Meier | 2014-07-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Changed low threshold in px4io firmware to 10%... | |||||
| * | | | | | | | | | | Changed low threshold in px4io firmware to 10% to ensure compatibility with ↵ | TickTock- | 2014-05-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user configured single channel, mode switches | |||||
* | | | | | | | | | | | Merge pull request #1112 from soulne4ny/master | Lorenz Meier | 2014-07-03 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | fix misprint `lowvsyslog` | |||||
| * | | | | | | | | | | fix misprint `lowvsyslog` | Alexey Luchko | 2014-07-03 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Hotfix of the Hotfix 8) | Lorenz Meier | 2014-07-03 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Hotfix: Typo in disabled code path | Lorenz Meier | 2014-07-03 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
| | | | | | | | * | Fix compile error: rename field in rc_channels.h | Thomas Gubler | 2014-07-02 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | | | | | | | * | Merge remote-tracking branch 'upstream/mavlinkexternalsetpoints' into ↵ | Thomas Gubler | 2014-07-02 | 19 | -202/+1336 | |
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_merge Conflicts: mavlink/include/mavlink/v1.0/common/common.h | |||||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpoints | Thomas Gubler | 2014-07-02 | 160 | -4720/+11254 | |
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mavlink/include/mavlink/v1.0/common/common.h |