Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-13 | 8 | -40/+176 |
|\ | | | | | | | | | Conflicts: src/modules/fw_att_control/fw_att_control_main.cpp | ||||
| * | Merge pull request #931 from PX4/fwtrim | Lorenz Meier | 2014-05-13 | 1 | -6/+7 |
| |\ | | | | | | | fw att control: manual setpoint: fix comment and trim sign | ||||
| | * | fw att control: manual setpoint: fix comment and trim sign | Thomas Gubler | 2014-05-13 | 1 | -6/+7 |
| | | | |||||
| * | | Merge pull request #926 from ultrasystem/patch-2 | Lorenz Meier | 2014-05-12 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Output a debug string is Invalid @ parameter #1 | ||||
| | * | Update paramters for warnx() | ultrasystem | 2014-05-12 | 1 | -1/+1 |
| | | | |||||
| | * | Output a debug string is Invalid @ parameter #1 | ultrasystem | 2014-05-12 | 1 | -1/+1 |
| | | | | | | | | | line 143 may be crash or buffer overflow. because the argument must is a pointer as char type that and have a valid buffer | ||||
| * | | Merge pull request #894 from PX4/yawrate_limit | Lorenz Meier | 2014-05-12 | 2 | -6/+29 |
| |\ \ | | |/ | |/| | mc_att_control: MC_YAWRATE_MAX parameter added | ||||
| | * | mc_att_control: MC_YAWRATE_MAX parameter added | Anton Babushkin | 2014-05-03 | 2 | -6/+29 |
| | | | |||||
| * | | Merge pull request #744 from thomasgubler/fw_landing_rangefinder | Thomas Gubler | 2014-05-12 | 4 | -27/+139 |
| |\ \ | | | | | | | | | Fw landing rangefinder | ||||
| | * | | fix comment for FW_LND_RFRALT | Thomas Gubler | 2014-03-15 | 1 | -3/+4 |
| | | | | |||||
| | * | | fw landing: do not use relative altitudes in TECS | Thomas Gubler | 2014-03-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | set range finder to disabled as default | Thomas Gubler | 2014-03-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | integrate range finder into fw landing | Thomas Gubler | 2014-03-15 | 4 | -27/+138 |
| | | | | |||||
* | | | | manual control setpoint: add comment about sign | Thomas Gubler | 2014-05-12 | 1 | -4/+11 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-12 | 26 | -441/+644 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | manual_control_setpoint: comments fixed | Anton Babushkin | 2014-05-11 | 1 | -4/+4 |
| | | | | |||||
| * | | | Reporting cleanup, use different variables for different state switching ↵ | Lorenz Meier | 2014-05-11 | 1 | -41/+23 |
| | | | | | | | | | | | | | | | | results to avoid being tripped on local / global name scope | ||||
| * | | | sensors: commented "offboard" switch removed | Anton Babushkin | 2014-05-11 | 2 | -14/+0 |
| | | | | |||||
| * | | | sensors, commander: code style fixed | Anton Babushkin | 2014-05-11 | 8 | -211/+345 |
| | | | | |||||
| * | | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 9 | -45/+45 |
| | | | | |||||
| * | | | Use "POSCTL" switch name consistently | Anton Babushkin | 2014-05-11 | 3 | -17/+17 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2014-05-09 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #720 from thomasgubler/navigator_rtl_waypointtype | Lorenz Meier | 2014-05-08 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | Navigator rtl: fix waypoint type | ||||
| | | * | | | navigator: RTL: set normal waypoint instead of takeoff waypoint in ↵ | Thomas Gubler | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | RTL_STATE_CLIMB | ||||
| | | * | | | navigator: RTL: set loiter wp instead of normal waypoint in RTL_STATE_DESCEND | Thomas Gubler | 2014-03-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove noreturn attribute from all apps that actually can return | Lorenz Meier | 2014-05-09 | 6 | -7/+7 |
| |/ / / / | |||||
| * | | | | Merge pull request #858 from TickTock-/rc_merged | Lorenz Meier | 2014-05-08 | 14 | -110/+267 |
| |\ \ \ \ | | | | | | | | | | | | | Rc merged | ||||
| | * | | | | shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch ↵ | TickTock- | 2014-04-29 | 3 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | mapping later | ||||
| | * | | | | Updated flight modes diagrams & comments. | TickTock- | 2014-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 14 | -93/+93 |
| | | | | | | |||||
| | * | | | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 14 | -94/+94 |
| | | | | | | |||||
| | * | | | | compiles | TickTock- | 2014-04-27 | 4 | -45/+2 |
| | | | | | | |||||
| | * | | | | Merged in upstream master | TickTock- | 2014-04-27 | 28 | -422/+689 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged | TickTock- | 2014-04-25 | 16 | -288/+473 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Made failsafe more intuitive. Default (0) maps to whatever channel is ↵ | TickTock- | 2014-04-22 | 2 | -21/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | throttle. If a non-zero value is entered, a direct channel map is used so use | ||||
| | * | | | | | | Added ASSISTED, AUTO, EASY, RETURN, & LOITER programmable thresholds to ↵ | TickTock- | 2014-04-22 | 2 | -23/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable various user mode switch configs (orig., 2x3, 1x6, etc). | ||||
| | * | | | | | | Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default ↵ | TickTock- | 2014-04-22 | 2 | -14/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to THROTTLE | ||||
| | * | | | | | | renamed mission_switch to loiter_switch and assisted_switch to easy_switch | TickTock- | 2014-04-22 | 5 | -23/+23 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into ↵ | TickTock- | 2014-04-22 | 16 | -471/+343 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | rc_merged | ||||
| | * | | | | | | | Added rc_map_failsafe to enable use of channels other than throttle for ↵ | TickTock- | 2014-04-19 | 2 | -8/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failsafe. | ||||
| * | | | | | | | | Fix a param save issue where a state variable might preven the parameters ↵ | Lorenz Meier | 2014-05-08 | 1 | -61/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from being saved (identified and fixed by ultrasystem) | ||||
| * | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware | Lorenz Meier | 2014-05-07 | 70 | -6414/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix MAVLink to use info warn level for text messages | Lorenz Meier | 2014-05-07 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | sensors: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -8/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | mc pos control: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | mc att control: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fw pos control: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -10/+10 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fw att control: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -7/+7 |
| | | | | | | | | | |