Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 2 | -22/+27 |
|\ | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2014-06-03 | 1 | -3/+3 |
| |\ | |||||
| | * | mavlink: for takeoff mission items don't set the time inside field. ↵ | Thomas Gubler | 2014-06-01 | 1 | -3/+3 |
| | | | | | | | | | | | | Correctly set pitch min when converting from mission item to mavlink mission item | ||||
| * | | Hotfix: Fix scaling for battery current | Lorenz Meier | 2014-06-03 | 1 | -1/+1 |
| |/ | |||||
| * | attempt to fix mavlink hardware flow control disable logic | Thomas Gubler | 2014-05-31 | 1 | -15/+17 |
| | | |||||
| * | Minor fixes to MAVLink | Lorenz Meier | 2014-05-29 | 1 | -2/+5 |
| | | |||||
| * | mavlink mission item takeoff: read correct param for minimal pitch | Thomas Gubler | 2014-05-28 | 1 | -2/+2 |
| | | |||||
* | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 1 | -1/+1 |
| | | |||||
* | | 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 | 9 | -34/+44 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | mavlink: Compile warning fixes | Lorenz Meier | 2014-05-21 | 7 | -16/+19 |
| | | |||||
| * | mavlink: minor fix | Anton Babushkin | 2014-05-20 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' into acro2 | Anton Babushkin | 2014-05-20 | 23 | -3380/+5546 |
| |\ | |||||
| | * | mavlink app: Reduce stack sizes minimally after further inspection | Lorenz Meier | 2014-05-16 | 2 | -2/+2 |
| | | | |||||
| | * | Merge branch 'ekf_params' of github.com:PX4/Firmware | Lorenz Meier | 2014-05-15 | 1 | -2/+11 |
| | |\ | |||||
| | | * | Merge branch 'master' of github.com:PX4/Firmware into ekf_params | Lorenz Meier | 2014-05-11 | 1 | -4/+4 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of github.com:PX4/Firmware into ekf_params | Lorenz Meier | 2014-05-09 | 1 | -4/+4 |
| | | |\ \ | |||||
| | * | | | | mavlink start tool: Reduce stack size to 1000 - it is really just the ↵ | Lorenz Meier | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | commandline handler | ||||
| | * | | | | mavlink app: Fix use of message buffer | Lorenz Meier | 2014-05-15 | 2 | -1/+2 |
| | | | | | | |||||
| | * | | | | mavlink, commander: Get back close to original stack sizes. Although tests ↵ | Lorenz Meier | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | came clean, we do not want to take any chances | ||||
| | * | | | | mavlink app: Use only the stack it needs to start | Lorenz Meier | 2014-05-14 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Reduce mavlink stack size slightly | Lorenz Meier | 2014-05-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #927 from PX4/ram_cleanup | Lorenz Meier | 2014-05-13 | 1 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Ram cleanup | ||||
| | | * | | | | mavlink: Removed static buffers where no static buffers where necessary | Lorenz Meier | 2014-05-12 | 1 | -2/+2 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-12 | 2 | -4/+6 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/uORB/topics/manual_control_setpoint.h | ||||
| | | * | | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 1 | -4/+4 |
| | | | |/ | | | |/| | |||||
| | | * | | Merge pull request #858 from TickTock-/rc_merged | Lorenz Meier | 2014-05-08 | 1 | -4/+4 |
| | | |\ \ | | | | | | | | | | | | | Rc merged | ||||
| | | | * | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 1 | -4/+4 |
| | | | | | | |||||
| | | | * | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | mavlink receiver: use new manual control setpoint variable names and fix ↵ | Thomas Gubler | 2014-05-12 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | sending of manual control setpoint mavlink message | ||||
| | * | | | | mavlink receiver: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into acro2 | Anton Babushkin | 2014-03-08 | 2 | -1/+13 |
| |\ \ \ \ \ | |||||
| * | | | | | | mavlink: custom mode ACRO added | Anton Babushkin | 2014-02-04 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params | Julian Oes | 2014-05-07 | 3 | -18/+27 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp | ||||
| * | | | | | | Merged master | Lorenz Meier | 2014-05-07 | 3 | -18/+27 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Fix MAVLink to use info warn level for text messages | Lorenz Meier | 2014-05-07 | 1 | -0/+2 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix in-air restarts, protect against an external MAVLink sender exploiting ↵ | Lorenz Meier | 2014-05-06 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | the restart mechanism | ||||
| | * | | | | mavlink: Only send the distance sensor message if the topic actually updates | Lorenz Meier | 2014-05-06 | 1 | -12/+13 |
| | | | | | | |||||
| | * | | | | mavlink: status is a pointer | Thomas Gubler | 2014-05-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | remove trailing whitespace | Thomas Gubler | 2014-05-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | mavlink: Only sending HIL control commands if the system is actually armed | Lorenz Meier | 2014-05-04 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | mavlink: swap x and y when handling MANUAL_CONTROL mavlink message | Anton Babushkin | 2014-05-01 | 1 | -2/+2 |
| | | |_|/ | | |/| | | |||||
* | | | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'px4/ekf_home_init' into ↵ | Julian Oes | 2014-04-26 | 3 | -7/+22 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_cleanup_ekf_home_init Conflicts: src/modules/commander/commander.cpp src/modules/mc_pos_control/mc_pos_control_main.cpp src/modules/navigator/navigator_main.cpp src/modules/uORB/topics/vehicle_global_position.h | ||||
| * | | | | Merged mpc_rc into ekf_params | Lorenz Meier | 2014-04-26 | 5 | -53/+56 |
| |\| | | | |||||
| | * | | | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-25 | 4 | -5/+34 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-23 | 1 | -0/+5 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' into rc_timeout | Anton Babushkin | 2014-04-22 | 8 | -34/+530 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | Merge branch 'mpc_local_pos' into mpc_rc | Anton Babushkin | 2014-04-23 | 3 | -2/+50 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-22 | 9 | -66/+555 |
| | | |\ \ \ \ \ \ |