Commit Graph

185 Commits

Author SHA1 Message Date
Julian Oes 3cb3fa224b Small fixes again 2013-03-26 15:37:13 -07:00
Julian Oes f8e5b0cb0e Small fixes and comments 2013-03-26 10:44:49 -07:00
Julian Oes 3665d7b86f Improved command handling, added a low priority task and various fixes 2013-03-25 14:53:54 -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
px4dev cd207705d5 Adjust audio pattern numbers. 2013-03-17 10:36:48 -07:00
Julian Oes 513e1c7398 Added missing prototype 2013-03-11 11:42:23 -07: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
Julian Oes 0fe5aeb02c Checkpoint: More state machine fixes, commited to wrong branch and now copied over 2013-03-11 10:39:57 -07:00
Lorenz Meier c848fd1d63 Merged master 2013-02-26 21:17:48 +01:00
Julian Oes 34c84752d1 Checkpoint: Added control flags 2013-02-25 09:24:30 -08:00
Thomas Gubler 6f1d7dc7de commander app sets an airspeed_valid flag in the vehicle status 2013-02-25 15:48:16 +01:00
Thomas Gubler c0a852dab4 airspeed (pitot) offset calibration 2013-02-24 21:57:38 +01:00
Julian Oes 0eca49a4f6 Checkpoint: Separated all bools in vehicle status into conditions and flags, they should be protected 2013-02-22 19:46:47 -08:00
Julian Oes f731b6f4e5 Merge remote-tracking branch 'upstream/px4io-i2c' into new_state_machine 2013-02-22 15:53:07 -08:00
Julian Oes 793b482e00 Checkpoint: Navigation states and arming seem to work 2013-02-22 15:52:13 -08:00
Julian Oes cbfa64b59e Checkpoint: Added switch handling 2013-02-22 11:54:41 -08:00
Julian Oes 36f9f8082e Checkpoint: Added flag checks inside navigation state update 2013-02-22 09:32:49 -08:00
Julian Oes be7aeb754b Checkpoint: Added flag checks inside arming state update 2013-02-21 20:01:54 -08:00
Julian Oes c056410f84 Checkpoint: Added arming check function 2013-02-21 18:10:34 -08:00
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
Lorenz Meier 16b0fa7fd4 Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c 2013-02-20 09:47:14 +01:00
Lorenz Meier 69d9265bc3 Adjusted stack size for commander app 2013-02-20 09:44:15 +01: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
Lorenz Meier 663ca58063 Merge branch 'master' of github.com:PX4/Firmware 2013-02-18 16:46:05 +01:00
Lorenz Meier 104d5aa365 More sensible error handling in calibration 2013-02-18 16:45:59 +01: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
Lorenz Meier 985838d971 Merged master 2013-02-17 18:12:48 +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 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
Julian Oes 0e2db0beb9 Checkpoint: implement new state machine, compiling, WIP 2013-02-16 13:40:09 -08:00
Julian Oes d962e6c403 Removed some unnecessairy flags, home position back working 2013-02-06 13:50:32 -08:00
Julian Oes fc4be3e728 Changed gps position topic mostly to SI units and float, removed counters and added specifig timestamps 2013-02-06 12:41:05 -08:00
px4dev 48e497e406 Fix a leftover from the earlier merges; building should work now. 2013-01-19 18:05:53 -08:00
px4dev c1a1207b9a Merge pull request #171 from PX4/fault_detection
Attitude / position estimation and controller improvements
2013-01-19 13:17:28 -08:00
Lorenz Meier 4b9916eded Made threshold a bit nicer, still a magic number 2013-01-19 19:32:44 +01:00
Lorenz Meier c9c64b3f25 Added missing flag, tested 2013-01-19 17:03:35 +01:00
Lorenz Meier f119d9fbda Added home position concept, uORB struct and MAVLink announcement of home position 2013-01-19 14:46:26 +01:00
Lorenz Meier dc5ddb9370 Defaulting to full auto in auto mode 2013-01-17 14:18:33 -05:00
px4dev 9faf348cf5 Merge pull request #156 from jgoppert/sensor_hil_rebase
Rebase of changes to sensor_hil_fixedwing branch.
2013-01-13 17:55:15 -08:00
Lorenz Meier 5ad8e645f4 Removed last bogus references to battery voltage from sensor combined topic 2013-01-14 00:42:20 +01:00
James Goppert ea3ce8de85 Reboot fix. 2013-01-13 18:22:35 -05:00
James Goppert 6d8983e908 Fixed HIL state machine issue with reboot. 2013-01-13 17:43:30 -05:00
Lorenz Meier dad7f9f436 Selected adjustments / fixes to make old apps compatible with new-style ADC driver 2013-01-12 00:38:49 +01:00
Lorenz Meier 31ca806958 More print cleanups in commander app 2013-01-11 08:24:28 +01:00