Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-25 | 7 | -22/+21 |
|\ | |||||
| * | launchdetector: fix copyright header | Thomas Gubler | 2014-04-25 | 7 | -22/+21 |
| | | |||||
* | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-13 | 2 | -5/+22 |
|\| | |||||
| * | airspeed: Prevent the filter from overshooting into the negative airspeed range | Lorenz Meier | 2014-04-05 | 2 | -5/+22 |
| | | |||||
* | | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-02 | 1 | -1/+0 |
|\| | |||||
| * | Merged mavlink_beta2 | Lorenz Meier | 2014-03-11 | 1 | -8/+8 |
| |\ | |||||
| * \ | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-03-11 | 5 | -27/+50 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-03-04 | 4 | -22/+26 |
| |\ \ \ | |||||
| * \ \ \ | Merged beta into paul_estimator | Lorenz Meier | 2014-02-16 | 40 | -2802/+1812 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge master | Lorenz Meier | 2014-01-31 | 1 | -0/+62 |
| |\ \ \ \ \ | |||||
| * | | | | | | Strip unused variable | Lorenz Meier | 2014-01-05 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'beta_mavlink2' into mpc_local_pos_mavlink | Anton Babushkin | 2014-03-19 | 1 | -16/+8 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merged stack size changes | Lorenz Meier | 2014-03-10 | 5 | -26/+36 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into beta_mavlink2 | Anton Babushkin | 2014-03-09 | 5 | -3/+16 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | geo: _wrap_XXX minor fix | Anton Babushkin | 2014-02-26 | 1 | -8/+8 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | copyright and code style fixes | Anton Babushkin | 2014-03-18 | 2 | -40/+60 |
| | | | | | | | |||||
* | | | | | | | geo lib: minor code style fix | Anton Babushkin | 2014-03-17 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | geo lib: major rewrite of map_projection_XXX functions | Anton Babushkin | 2014-03-17 | 2 | -101/+43 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | launchdetection: better integration of Blocks class | Thomas Gubler | 2014-03-08 | 5 | -26/+36 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge remote-tracking branch 'upstream/master' into launchdetector | Thomas Gubler | 2014-03-06 | 4 | -22/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * | | | | l1_pos_control: prevent NaNs for roll setpoint | Julian Oes | 2014-02-24 | 1 | -2/+11 |
| | | | | | |||||
| * | | | | TECS: warning fixes | Julian Oes | 2014-02-19 | 1 | -14/+13 |
| | | | | | |||||
| * | | | | TECS: use constant from geo | Julian Oes | 2014-02-19 | 2 | -6/+2 |
| | |_|/ | |/| | | |||||
* / | | | launchdetector: add reset, #663 | Thomas Gubler | 2014-02-17 | 5 | -3/+16 |
|/ / / | |||||
* | | | Add a lot of MAVLink parameter documentation. | Stefan Rado | 2014-02-14 | 1 | -15/+33 |
| | | | |||||
* | | | remove printf in launchdetector | Thomas Gubler | 2014-02-01 | 1 | -4/+0 |
| | | | |||||
* | | | Merge branch 'wrap_pi_fixes' into beta | Anton Babushkin | 2014-02-01 | 1 | -18/+36 |
|\ \ \ | |||||
| * | | | geo: cleanup of wrap_XXX functions | Anton Babushkin | 2013-11-13 | 1 | -18/+36 |
| | | | | |||||
* | | | | lib/geo: bugs fixed, added function add_vector_to_global_position() | Anton Babushkin | 2014-01-28 | 2 | -12/+21 |
| | | | | |||||
* | | | | fw: remove duplicate feedforward | Thomas Gubler | 2014-01-22 | 3 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'autostart_cleanup' into navigator_new_vector | Anton Babushkin | 2014-01-17 | 1 | -0/+62 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | hw_ver app added for hardware version checking | Anton Babushkin | 2014-01-07 | 1 | -0/+62 |
| | |/ | |/| | |||||
| * | | tecs: change pitch on climbout #559 (ported from ardupilot) | Thomas Gubler | 2014-01-02 | 1 | -0/+8 |
| | | | |||||
* | | | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-06 | 9 | -35/+498 |
|\ \ \ | |||||
| * | | | launchdetection: rename pre takeoff throttle param and fix usage | Thomas Gubler | 2014-01-05 | 3 | -5/+5 |
| | | | | |||||
| * | | | launchdetection: add minimal throttle, fix parameter update | Thomas Gubler | 2014-01-05 | 3 | -6/+16 |
| | | | | |||||
| * | | | create geofence class and start moving fence functionality to this class | Thomas Gubler | 2014-01-02 | 2 | -35/+0 |
| | | | | |||||
| * | | | fixed launchdetection logic, catapult tested in HIL | Thomas Gubler | 2013-12-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'launchdetection' into navigator_new_fw | Thomas Gubler | 2013-12-29 | 7 | -0/+483 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| | * | | | initial wip version of launchdetector | Thomas Gubler | 2013-11-15 | 7 | -0/+483 |
| | | |/ | | |/| | |||||
* | | | | Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into ↵ | Anton Babushkin | 2013-12-30 | 6 | -22/+1 |
|\| | | | | | | | | | | | | | | | navigator_new_vector | ||||
| * | | | fw att ctrl: removed unused parameter | Thomas Gubler | 2013-12-29 | 3 | -5/+1 |
| | | | | |||||
| * | | | fw att ctrl: remove renamed parameters | Thomas Gubler | 2013-12-29 | 6 | -17/+0 |
| | | | | |||||
* | | | | Merge branch 'navigator_new' into navigator_new_vector, WIP | Anton Babushkin | 2013-12-28 | 11 | -153/+532 |
|\| | | | |||||
| * | | | Prevent some warnings for lat/lon double conversions | Julian Oes | 2013-12-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch '559_tecs_climbout' into ↵ | Thomas Gubler | 2013-12-23 | 1 | -0/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups | ||||
| | * | | | tecs: change pitch on climbout #559 (ported from ardupilot) | Thomas Gubler | 2013-12-23 | 1 | -0/+8 |
| | | |/ | | |/| | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2013-12-13 | 1 | -0/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | | | Mavlink and navigator: Disable some functions in mavlink that are taken over ↵ | Julian Oes | 2013-11-27 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | by navigator, introduce topic to report mission status from commander back to mavlink | ||||
| * | | | Merge branch 'fw_autoland_att_tecs' into fw_autoland_att_tecs_navigator | Thomas Gubler | 2013-11-25 | 2 | -34/+53 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/external_lgpl/tecs/tecs.cpp src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp |