aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disable the PPM parsing on FMU - who knows..rc_hardeningLorenz Meier2014-05-121-31/+31
* Read out the RC status at the same transfer as the channels to ensure we got ...Lorenz Meier2014-05-121-1/+3
* Set an RC status flag so that we can read out the RC status in parallel to th...Lorenz Meier2014-05-122-1/+7
* Reporting cleanup, use different variables for different state switching resu...Lorenz Meier2014-05-111-41/+23
* Merge pull request #920 from PX4/posctl_cleanupLorenz Meier2014-05-1118-288/+408
|\
| * sensors: commented "offboard" switch removedAnton Babushkin2014-05-112-14/+0
| * sensors, commander: code style fixedAnton Babushkin2014-05-118-211/+345
| * ALTCTRL/POSCTRL renamed to ALTCTL/POSCTLAnton Babushkin2014-05-1110-47/+47
| * Use "POSCTL" switch name consistentlyAnton Babushkin2014-05-113-17/+17
|/
* Merge branch 'master' of github.com:PX4/FirmwareLorenz Meier2014-05-091-2/+2
|\
| * Merge pull request #720 from thomasgubler/navigator_rtl_waypointtypeLorenz Meier2014-05-081-2/+2
| |\
| | * navigator: RTL: set normal waypoint instead of takeoff waypoint in RTL_STATE_...Thomas Gubler2014-03-111-1/+1
| | * navigator: RTL: set loiter wp instead of normal waypoint in RTL_STATE_DESCENDThomas Gubler2014-03-111-1/+1
* | | Remove noreturn attribute from all apps that actually can returnLorenz Meier2014-05-096-7/+7
* | | Remove noreturn attribute from all drivers that actually can returnLorenz Meier2014-05-093-3/+3
|/ /
* | Merge pull request #858 from TickTock-/rc_mergedLorenz Meier2014-05-0817-112/+269
|\ \
| * | Revert mavlink library header back to original namesTickTock-2014-05-011-2/+2
| * | update diagramsTickTock-2014-04-292-0/+0
| * | shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch ma...TickTock-2014-04-293-13/+13
| * | Updated flight modes diagrams & comments.TickTock-2014-04-284-3/+3
| * | Replaces poshold/althold with posctrl/altctrlTickTock-2014-04-2816-97/+97
| * | renamed EASY to POSHOLD and SEATBELT to ALTHOLDTickTock-2014-04-2715-96/+96
| * | compilesTickTock-2014-04-274-45/+2
| * | Merged in upstream masterTickTock-2014-04-2750-513/+814
| |\ \
| * | | Added switch priority flowchartTickTock-2014-04-262-0/+0
| * | | updated flight modes diagramTickTock-2014-04-262-0/+0
| * | | Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_mergedTickTock-2014-04-2519-430/+569
| |\ \ \
| * | | | Made failsafe more intuitive. Default (0) maps to whatever channel is thrott...TickTock-2014-04-222-21/+9
| * | | | Added ASSISTED, AUTO, EASY, RETURN, & LOITER programmable thresholds to enabl...TickTock-2014-04-222-23/+138
| * | | | Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default to...TickTock-2014-04-222-14/+39
| * | | | renamed mission_switch to loiter_switch and assisted_switch to easy_switchTickTock-2014-04-225-23/+23
| * | | | Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_me...TickTock-2014-04-2216-471/+343
| |\ \ \ \
| * | | | | Added rc_map_failsafe to enable use of channels other than throttle for fails...TickTock-2014-04-192-8/+40
* | | | | | Merge pull request #839 from eneadev/patch-1Lorenz Meier2014-05-081-1/+1
|\ \ \ \ \ \
| * | | | | | Update drv_hrt.ceneadev2014-04-191-1/+1
* | | | | | | Fix a param save issue where a state variable might preven the parameters fro...Lorenz Meier2014-05-082-61/+21
* | | | | | | Removing an unwanted usleep on poll errorsLorenz Meier2014-05-081-2/+1
* | | | | | | Merge branch 'master' of github.com:PX4/FirmwareLorenz Meier2014-05-0772-6511/+178
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #891 from Kynos/masterLorenz Meier2014-05-071-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Reset MS5611 baro sensor after an errorKynos2014-05-021-0/+5
| * | | | | | | | Merge pull request #896 from PX4/modules_cleanupLorenz Meier2014-05-0769-6414/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | att_pos_estimator_ekf restoredAnton Babushkin2014-05-045-0/+1254
| | * | | | | | | | Unused deprecated modules removed: att_pos_estimator_ekf, fixedwing_att_contr...Anton Babushkin2014-05-0474-7668/+0
| * | | | | | | | | Merge pull request #782 from PX4/fmu_mixerLorenz Meier2014-05-071-97/+156
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into fmu_mixerAnton Babushkin2014-04-071-6/+4
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fmu driver: bugs fixedAnton Babushkin2014-04-071-22/+23
| | * | | | | | | | | | Merge branch 'master' into fmu_mixerAnton Babushkin2014-04-0767-510/+4896
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | px4fmu: support all actuator control groups, dynamically subscribe to require...Anton Babushkin2014-03-301-98/+156
| * | | | | | | | | | | | Merge pull request #909 from PX4/failsafe_reportingLorenz Meier2014-05-071-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Much better failsafe reporting on failsafe state changesLorenz Meier2014-05-061-0/+17