Commit Graph

16 Commits

Author SHA1 Message Date
Julian Oes 06a94cacd5 Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	apps/controllib/fixedwing.cpp
2013-03-25 17:29:34 -07:00
Julian Oes 6039582928 Compile error after merge fixed 2013-03-22 09:04:08 -07:00
Julian Oes 7f32c01a1d Merge branch 'master' into new_state_machine
Conflicts:
	apps/controllib/fixedwing.cpp
2013-03-22 08:57:26 -07:00
jgoppert 9c9873bcc1 Fixed PID roc2Thr param names/ added them to controldemo. 2013-03-18 16:18:58 -04:00
jgoppert 90f9b154eb Flipped simple mode pitch/throttle channel input. 2013-03-18 15:18:08 -04:00
jgoppert 3c6fbeb1a0 Added seatbelt fixedwing controller. 2013-03-18 15:09:15 -04:00
Lorenz Meier 002fb1b4ea Merge pull request #225 from PX4/sign_fix
Fix signs for fixed wing control
2013-03-17 03:16:55 -07:00
Lorenz Meier a0afed400f Fix signs for fixed wing control, issue resulted from consistently flipped pitch response for IO and FMU 2013-03-16 23:41:24 +01:00
Lorenz Meier 688ec090e8 Moved trim for fixed wing to standard trim values, can now be calibrated via RC 2013-03-14 22:43:45 +01:00
Julian Oes 591cc0ac4d Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	apps/commander/commander.c
	apps/uORB/topics/vehicle_status.h
2013-03-11 11:01:49 -07:00
Simon Wilks a8a74fda96 Invert aileron actuator for correct aileron response in auto 2013-03-09 22:11:31 +01:00
Julian Oes ebe0285ce7 Checkpoint: navigation state machine as discussed with Lorenz 2013-02-21 13:06:56 -08:00
Julian Oes 0e2db0beb9 Checkpoint: implement new state machine, compiling, WIP 2013-02-16 13:40:09 -08:00
Lorenz Meier d129eff5b9 Turned all control outputs into NED frame moments, this is validated in real flight with a correct mixer setup. 2013-02-13 12:49:33 +01:00
Lorenz Meier b48f99b601 Updated state switching to most recent state machine rev 2013-01-08 22:22:22 +01:00
px4dev faced6bfe3 Merge James's controllib bits into a separate library module.
Add a top-level mathlib header to avoid having to dig around for specific headers.
2013-01-06 15:04:30 -08:00