Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into fw_staging_ouputlimit_master | Thomas Gubler | 2013-10-31 | 16 | -252/+533 |
|\ | |||||
| * | Merge branch 'master' of github.com:PX4/Firmware into pwm_ioctls | Lorenz Meier | 2013-10-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge pull request #496 from PX4/wp_yaw_fix | Lorenz Meier | 2013-10-30 | 1 | -1/+1 |
| | |\ | | | | | | | | | missionlib: waypoint yaw fix | ||||
| | | * | missionlib: waypoint yaw fix | Anton Babushkin | 2013-10-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:PX4/Firmware into pwm_ioctls | Lorenz Meier | 2013-10-30 | 25 | -711/+1066 |
| |\| | | |||||
| | * | | Hotfix: Announcing important messages via audio | Lorenz Meier | 2013-10-28 | 1 | -29/+29 |
| | | | | |||||
| | * | | px4io: fixed the io_reg_{set,get} errors | Andrew Tridgell | 2013-10-28 | 3 | -31/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | this fixes the PX4IO state machine to avoid the io errors we were seeing. There are still some open questions with this code, but it now seems to give zero errors, which is an improvement! | ||||
| | * | | Merge branch 'fw_autoland' of github.com:PX4/Firmware into fw_autoland | Lorenz Meier | 2013-10-24 | 2 | -21/+57 |
| | |\ \ | |||||
| | | * | | Fixes, but approach needs proper design | Lorenz Meier | 2013-10-18 | 2 | -21/+57 |
| | | | | | |||||
| | * | | | Merge branch 'master' of github.com:PX4/Firmware into fw_autoland | Lorenz Meier | 2013-10-24 | 21 | -624/+882 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | * | | Almost perfect landing approach, needs touch-down fine tuning | Lorenz Meier | 2013-10-17 | 2 | -22/+62 |
| | | | | |||||
| | * | | More improvements on landing | Lorenz Meier | 2013-10-17 | 2 | -10/+64 |
| | | | | |||||
| | * | | Small improvements to autoland, ensure that throttle can be shut down close ↵ | Lorenz Meier | 2013-10-16 | 2 | -7/+26 |
| | | | | | | | | | | | | | | | | to touch down. Depends on accurate land WP altitude | ||||
| * | | | Fixed pwm limit to apply the proper limits / scaling | Lorenz Meier | 2013-10-30 | 1 | -3/+19 |
| | | | | |||||
| * | | | Fix to allow setting again zero disarmed PWM values after boot | Lorenz Meier | 2013-10-30 | 1 | -16/+29 |
| | | | | |||||
| * | | | Fixed min value check, works for fixed wing now | Lorenz Meier | 2013-10-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'px4/master' into pwm_ioctls | Julian Oes | 2013-10-19 | 23 | -488/+789 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | | | | pwm systemcmd can now set the failsafe values, fmu uses failsafe values as ↵ | Julian Oes | 2013-10-19 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | well now, fix to only send the appropriate number of pwm values to IO at once | ||||
| * | | | | Merge remote-tracking branch 'px4/master' into pwm_ioctls | Julian Oes | 2013-10-11 | 20 | -75/+297 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | | | | | Changed pwm_limit interface a bit | Julian Oes | 2013-10-11 | 3 | -17/+14 |
| | | | | | | |||||
| * | | | | | Use unsigned for channel counts | Julian Oes | 2013-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Small function definition correction | Julian Oes | 2013-10-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Moved PWM ramp to systemlib | Julian Oes | 2013-10-08 | 6 | -108/+236 |
| | | | | | | |||||
| * | | | | | Trying to get rid of magic PWM numbers | Julian Oes | 2013-10-07 | 2 | -17/+17 |
| | | | | | | |||||
| * | | | | | pwm info provides more information, some fixes for setting rate/min/max/disarmed | Julian Oes | 2013-10-07 | 4 | -34/+31 |
| | | | | | | |||||
* | | | | | | manual merge fw_integrator_fix_ouputlimit into fw_staging_ouputlimit | Thomas Gubler | 2013-10-24 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | constrain integrator part in control output until startup detection is ↵ | Thomas Gubler | 2013-10-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | available for safety reasons | ||||
* | | | | | | | Merge branch 'fw_pid_cleanup' into fw_staging | Thomas Gubler | 2013-10-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix small bug where roll instead of pitch was used | Thomas Gubler | 2013-10-24 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fw_jacobians_and_yaw' into fw_staging | Thomas Gubler | 2013-10-24 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fw att ctrl: transpose R | Thomas Gubler | 2013-10-24 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | fw ctrl: rename parameters to more consistent names | Thomas Gubler | 2013-10-24 | 2 | -27/+27 |
| | | | | | | | | |||||
* | | | | | | | | wip fw ctrl, several small bugfixes, set limit to 1 | Thomas Gubler | 2013-10-24 | 2 | -23/+27 |
| | | | | | | | | |||||
* | | | | | | | | fw att ctrl: rename some variables | Thomas Gubler | 2013-10-24 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | fw att control: bugfixes for integrator | Thomas Gubler | 2013-10-24 | 2 | -6/+13 |
|/ / / / / / | |||||
* | | | | | | change wrong comment | Thomas Gubler | 2013-10-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | wip, minor bugfixes in fw att control | Thomas Gubler | 2013-10-24 | 2 | -5/+7 |
| | | | | | | |||||
* | | | | | | wip, fw attitude ctrl: split into attitude and rate, compiles, untested | Thomas Gubler | 2013-10-24 | 1 | -17/+67 |
| | | | | | | |||||
* | | | | | | wip, fw att ctrl: coordinated turn | Thomas Gubler | 2013-10-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | using jacobians in fw attitude control | Thomas Gubler | 2013-10-24 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #469 from PX4/gimbal_rc_control | Lorenz Meier | 2013-10-24 | 4 | -2/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | Gimbal rc control | ||||
| * | | | | | Enable payload channels as direct pass-through from manual control | Lorenz Meier | 2013-10-15 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:PX4/Firmware into gimbal_rc_control | Lorenz Meier | 2013-10-15 | 1 | -1/+10 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Piping through manual control channels | Lorenz Meier | 2013-10-15 | 3 | -0/+32 |
| | | | | | | |||||
* | | | | | | added parameter for maximal roll angle | Thomas Gubler | 2013-10-24 | 2 | -0/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #482 from thomasgubler/airspeed | Lorenz Meier | 2013-10-23 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix scaling (unit) of airspeed in HIL | ||||
| * | | | | | | fix scaling (unit) of airspeed in HIL | Thomas Gubler | 2013-10-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/modules/mavlink/mavlink_receiver.cpp | ||||
* | | | | | | | sdlog2: parameters logging implemented (APM-compatible) | Anton Babushkin | 2013-10-23 | 3 | -47/+110 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into sdlog2_ver | Anton Babushkin | 2013-10-23 | 21 | -614/+903 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #483 from PX4/calib_rotation | Lorenz Meier | 2013-10-23 | 7 | -471/+546 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Calibration of rotated board |