Commit Graph

2949 Commits

Author SHA1 Message Date
Julian Oes ebe0285ce7 Checkpoint: navigation state machine as discussed with Lorenz 2013-02-21 13:06:56 -08:00
Julian Oes 0e29f2505a Checkpoint: New hierarchical states 2013-02-20 10:38:06 -08:00
Julian Oes aab6214cdc Checkpoint: Added HIL state, arming/disarming works now, also from GQC 2013-02-19 12:32:47 -08:00
Julian Oes b7faaca435 Checkpoint: Arming/Disarming works 2013-02-18 16:35:34 -08:00
Julian Oes f8326300e8 Merge branch 'px4io-i2c' into new_state_machine
Conflicts:
	apps/uORB/topics/vehicle_status.h
2013-02-18 14:06:09 -08:00
Julian Oes 5e7a38d946 Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-02-18 13:55:43 -08:00
Julian Oes 5eac78d764 Checkpoint: Added DESCENT state 2013-02-18 13:52:18 -08:00
Julian Oes 47b05eeb87 Checkpoint, arming/disarming still has a bug 2013-02-17 23:07:07 -08:00
Julian Oes 3bc385c789 Checkpoint: Added arming state check 2013-02-17 15:04:01 -08:00
Andrew Tridgell 9f15f38e57 Merged, removed unneeded line 2013-02-17 18:29:18 +01:00
Lorenz Meier 3b9488cc8b Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c-nuttx 2013-02-17 18:14:48 +01:00
Lorenz Meier 520a2b4174 Merge pull request #198 from PX4/nuttx-merge-5596
Nuttx merge 5596
2013-02-17 09:14:12 -08:00
Lorenz Meier 219279ac82 Merge branch 'px4io-i2c' into px4io-i2c-nuttx 2013-02-17 18:13:09 +01:00
Lorenz Meier 985838d971 Merged master 2013-02-17 18:12:48 +01:00
Lorenz Meier 2745c3276f Merge branch 'master' of github.com:PX4/Firmware 2013-02-17 18:11:46 +01:00
Lorenz Meier 3d3a68a7fb Removed confusing non-error message, updated start scripts to match wiki and most recent SW revs 2013-02-17 18:11:33 +01:00
Lorenz Meier 56bf9855a8 Finished and tested in-air restore of arming state, as long as both boards reset at the same time armings state is now retained 2013-02-17 17:47:26 +01:00
Lorenz Meier 5085a28240 Merge branch 'px4io-i2c' into px4io-i2c-nuttx 2013-02-17 16:38:42 +01:00
Lorenz Meier f689f0abb0 Fixed excessive debug buffer size 2013-02-17 16:38:19 +01:00
Lorenz Meier d677512981 Merge branch 'px4io-i2c' of github.com:PX4/Firmware into px4io-i2c-nuttx 2013-02-17 16:33:59 +01:00
Lorenz Meier 038037d676 Allow to in-air restore the FMU and IO arming state if only one of the two fails 2013-02-17 16:06:33 +01:00
Lorenz Meier 5d92e0195f Re-enabled signals 2013-02-17 15:32:46 +01:00
Lorenz Meier 8f8e30052b Merged 2013-02-17 15:29:31 +01:00
Lorenz Meier 6bd18e46bb Disable signals again, it is too early (needs NuttX merge) 2013-02-17 15:25:59 +01:00
Lorenz Meier 0ffcb1b401 Merge branch 'master' into px4io-i2c 2013-02-17 13:08:21 +01:00
Lorenz Meier 9fb024b1f2 Removed old GPS app 2013-02-17 13:07:40 +01:00
Andrew Tridgell 04bea8678e Merged debuglevel command from Tridge 2013-02-17 13:03:36 +01:00
Andrew Tridgell a33f314a25 More output 2013-02-17 12:53:12 +01:00
Julian Oes 0e2db0beb9 Checkpoint: implement new state machine, compiling, WIP 2013-02-16 13:40:09 -08:00
Lorenz Meier 4216982d54 Made timeouts configurable, untested 2013-02-16 21:28:43 +01:00
Andrew Tridgell caade93ae4 px4io: enable signals
signals will be used to wakeup the mixer on a new set of pwm values
2013-02-16 21:22:31 +01:00
Lorenz Meier 730916cd17 Merge branch 'master' into px4io-i2c 2013-02-16 18:35:46 +01:00
Lorenz Meier 2d1009a897 Fixed log conversion file 2013-02-16 18:35:36 +01:00
Lorenz Meier 598622a00f Slightly adjusted battery voltage measurement after calibration against B&K Precision lab supply with beefy wiring. Needs more cross-validation. 2013-02-16 18:16:29 +01:00
Lorenz Meier 63d95f672e Merge branch 'master' into px4io-i2c 2013-02-16 18:01:34 +01:00
Lorenz Meier 1c98343e7b Merge branch 'master' of github.com:PX4/Firmware 2013-02-16 18:01:15 +01:00
Lorenz Meier a0780a20b5 Fixed default airspeed for fixed wing control app 2013-02-16 18:00:58 +01:00
Lorenz Meier 400b073aa3 Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c 2013-02-16 16:46:57 +01:00
Lorenz Meier 781845587c Merge pull request #195 from PX4/gps
GPS driver rewrite
2013-02-15 13:46:03 -08:00
Lorenz Meier 5b8ad11498 Merge pull request #192 from PX4/tests
Fixed test outputs, decoupled tests from NuttX low-level output
2013-02-15 13:45:33 -08:00
Lorenz Meier 5e8efbf2e9 Merge pull request #201 from PX4/fixedwing_ned_outputs
Turned all control outputs into NED frame moments
2013-02-14 23:42:25 -08:00
Lorenz Meier 2e73421fa0 Merge pull request #178 from PX4/attitude_filter_improvement
Better attitude filter, not sensitive to sudden accelerations
2013-02-14 23:36:43 -08:00
Julian Oes ae51810a81 Changed names and default values of attitude estimator parameters 2013-02-14 20:17:18 -08:00
Andrew Tridgell 6eb69b07a8 Merged debug level commits from Tridge 2013-02-14 23:06:52 +01:00
Andrew Tridgell bfecfbf5ee px4io: added isr_debug()
this is useful for debugging px4io internals
2013-02-14 19:30:15 +01:00
Lorenz Meier dd858f7056 Merge pull request #197 from PX4/mpu6000_fixes
MPU6000 driver improvements
2013-02-13 06:31:42 -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 31cfec3dbd Hotfix: Disable board detect, as it just creates noise, enable it once time permits to wrap it up 2013-02-13 09:11:14 +01:00
Lorenz Meier cd0d108b6b Merged 2013-02-13 08:40:12 +01:00
Lorenz Meier 4595cc65b8 Reworked manual override flag, reworked arming slightly. Pending testing 2013-02-13 08:38:31 +01:00