Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1279 from PX4/takeoff_fix | Lorenz Meier | 2014-10-05 | 2 | -37/+73 |
|\ | | | | | navigator: skip takeoff if already above takeoff altitude | ||||
| * | Fixed function name of mission modification logic, attributed @DrTon | Lorenz Meier | 2014-10-05 | 2 | -10/+12 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into takeoff_fix | Thomas Gubler | 2014-10-05 | 40 | -196/+2492 |
| |\ | |/ |/| | | | | | Conflicts: src/modules/navigator/mission.cpp | ||||
* | | Merge pull request #1286 from PX4/mpc_track | Lorenz Meier | 2014-10-04 | 1 | -40/+208 |
|\ \ | | | | | | | mc_pos_control: path following and smooth transitions on waypoints in AUTO | ||||
| * | | mc_pos_control: AUTO speed limiting bug fixed | Anton Babushkin | 2014-10-02 | 1 | -4/+6 |
| | | | |||||
| * | | Merge branch 'master' into mpc_track | Anton Babushkin | 2014-09-28 | 13 | -40/+222 |
| |\ \ | |||||
| * | | | mc_pos_control: commented code block removed | Anton Babushkin | 2014-09-28 | 1 | -10/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into mpc_track | Anton Babushkin | 2014-09-18 | 45 | -806/+2659 |
| |\ \ \ | |||||
| * | | | | mc_pos_control: move position offset limiting to separate method | Anton Babushkin | 2014-09-01 | 1 | -0/+28 |
| | | | | | |||||
| * | | | | mc_pos_control: reset position setpoint on entering to AUTO mode | Anton Babushkin | 2014-09-01 | 1 | -5/+14 |
| | | | | | |||||
| * | | | | Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_track | Anton Babushkin | 2014-09-01 | 76 | -489/+2183 |
| |\ \ \ \ | |||||
| * | | | | | mc_pos_control: navigation fixes, smooth position setpoint movements | Anton Babushkin | 2014-08-17 | 1 | -33/+44 |
| | | | | | | |||||
| * | | | | | mc_pos_control: trajectory following, using previous and next waypoints | Anton Babushkin | 2014-08-16 | 1 | -28/+156 |
| | | | | | | |||||
* | | | | | | Merge pull request #1377 from PX4/revert-1376-hud_alt_reporting | Thomas Gubler | 2014-10-04 | 1 | -5/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "Use global position altitude to report HUD altitude, for consist... | ||||
| * | | | | | | Revert "Use global position altitude to report HUD altitude, for consistency." | Lorenz Meier | 2014-10-04 | 1 | -5/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1376 from tstellanova/hud_alt_reporting | Lorenz Meier | 2014-10-04 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use global position altitude to report HUD altitude, for consistency. | ||||
| * | | | | | | Use global position altitude to report HUD altitude, for consistency. | tstellanova | 2014-10-03 | 1 | -1/+5 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Otherwise the HUD altitude jumps between two very different values. | ||||
* | | | | | | Deactivate FrSky telem by default | Lorenz Meier | 2014-09-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Flash optimization | Lorenz Meier | 2014-09-30 | 2 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #1213 from PX4/obcfailsafe | Lorenz Meier | 2014-09-30 | 36 | -141/+2268 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Obc failsafe | ||||
| * | | | | | | commander: update gps and engine cb only when changed | Thomas Gubler | 2014-09-30 | 2 | -6/+16 |
| | | | | | | | |||||
| * | | | | | | px4io driver: update cb only when changed | Thomas Gubler | 2014-09-30 | 1 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | add and activate circuit breaker for gps failure detection | Thomas Gubler | 2014-09-30 | 3 | -2/+18 |
| | | | | | | | |||||
| * | | | | | | enable engine failure circuit breaker | Thomas Gubler | 2014-09-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | remove wrong comments | Thomas Gubler | 2014-09-30 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream' into master_obcfailsafe | Thomas Gubler | 2014-09-30 | 1 | -10/+7 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Set filter frequency for hardware and software in parallel, always do so in ↵ | Lorenz Meier | 2014-09-30 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same order | ||||
* | | | | | | | mpu6k: set hardware filter during ACCELIOCLOWPASS | Randy Mackay | 2014-09-30 | 1 | -10/+5 |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also set from GYROIOCLOWPASS Conflicts: mavlink/include/mavlink/v1.0 | ||||
| * | | | | | disable flight termination as default for now | Thomas Gubler | 2014-09-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | increase default engine failure threshold | Thomas Gubler | 2014-09-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | make geofence update rate independent from positon update rate | Thomas Gubler | 2014-09-28 | 1 | -5/+7 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' into HEAD | Thomas Gubler | 2014-09-28 | 49 | -742/+2564 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/geofence.cpp src/modules/navigator/mission.cpp | ||||
| * | | | | | commander: move position of gps failure check | Thomas Gubler | 2014-09-22 | 1 | -18/+17 |
| | | | | | | |||||
| * | | | | | navigator: fix status information, remove fence_valid flag (this is handled ↵ | Thomas Gubler | 2014-09-22 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | by the geofence class) | ||||
| * | | | | | geofence: better usefeedback if loaded | Thomas Gubler | 2014-09-22 | 3 | -1/+11 |
| | | | | | | |||||
| * | | | | | Revert "datalink check: ignore onboard computer" | Thomas Gubler | 2014-09-22 | 2 | -30/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f8793210b47bd8e09ed2adaabc2fab966db5df6. Conflicts: src/modules/commander/commander.cpp src/modules/commander/commander_params.c | ||||
| * | | | | | gps failure has priority over engine falure, in case both fail make sure | Thomas Gubler | 2014-09-22 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | that the gps failure mode does not turn on the engine | ||||
| * | | | | | fix typo in comment | Thomas Gubler | 2014-09-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | if V_RCL_LT < 0 go directly to termination | Thomas Gubler | 2014-09-22 | 2 | -5/+13 |
| | | | | | | |||||
| * | | | | | flight termination mavlink outtput: limit rate | Thomas Gubler | 2014-09-22 | 1 | -2/+7 |
| | | | | | | |||||
| * | | | | | make rc loss timeout a param | Thomas Gubler | 2014-09-22 | 2 | -2/+16 |
| | | | | | | |||||
| * | | | | | engine failure detection | Thomas Gubler | 2014-09-22 | 4 | -4/+95 |
| | | | | | | |||||
| * | | | | | navigator: geofence with global pos: reduce update rate | Thomas Gubler | 2014-09-21 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | datman: reduce task priority | Thomas Gubler | 2014-09-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | commander: improve output on gf violation | Thomas Gubler | 2014-09-21 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | datalink check: ignore onboard computer | Thomas Gubler | 2014-09-03 | 2 | -3/+27 |
| | | | | | | |||||
| * | | | | | write sysid & compid to telemetry status | Thomas Gubler | 2014-09-03 | 2 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-09-03 | 9 | -75/+216 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-09-02 | 6 | -26/+57 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-08-30 | 8 | -29/+43 |
| |\ \ \ \ \ \ |