Commit Graph

110 Commits

Author SHA1 Message Date
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
Greg Hulands 6eca4ba462 Maxbotix I2C Sonar Support 2013-03-01 09:20:00 -08:00
Lorenz Meier 72a8ba074e Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c 2013-03-01 16:07:11 +01:00
Lorenz Meier 433c954858 Hotfix: Fix program flow for uORB non-published topics 2013-03-01 16:06:52 +01:00
Lorenz Meier b7a510dfcb Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c 2013-03-01 09:43:40 +01:00
Lorenz Meier eb9930de25 Merge branch 'master' of github.com:PX4/Firmware 2013-03-01 09:42:51 +01:00
Lorenz Meier 81594c1abc Hotfix: return correct value for orb_check() for never-published topics 2013-03-01 09:42:39 +01:00
Lorenz Meier c848fd1d63 Merged master 2013-02-26 21:17:48 +01: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
Thomas Gubler 2707d2c1dd more fixes for the airspeed readout 2013-02-24 16:01:08 +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 36f9f8082e Checkpoint: Added flag checks inside navigation state update 2013-02-22 09:32:49 -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
Julian Oes aab6214cdc Checkpoint: Added HIL state, arming/disarming works now, also from GQC 2013-02-19 12:32:47 -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 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
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
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
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 b66b234acd Merge branch 'master' into px4io-i2c 2013-01-22 19:56:14 -08:00
Lorenz Meier ac215185a9 Better attitude filter, not sensitive to sudden accelerations 2013-01-21 17:30:53 +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
px4dev 646b926ac9 minor doc fix 2013-01-15 23:00:21 -08:00
Lorenz Meier 5ad8e645f4 Removed last bogus references to battery voltage from sensor combined topic 2013-01-14 00:42:20 +01:00
Lorenz Meier 1d4feb6905 Merged sdlog_buffering branch 2013-01-10 14:43:59 +01:00
Lorenz Meier 16e49c447d Added support for battery voltage and differential pressure to logging and plot script 2013-01-09 16:37:45 +01:00
Lorenz Meier 780087acf0 Merged with master 2013-01-08 21:25:38 +01:00
unknown 1998ce1205 Battery-Warn-State added to struct Vehicle_Status 2013-01-08 20:37:47 +01:00
Lorenz Meier 34d078b556 Merged latest master 2013-01-06 11:32:08 +01:00
Lorenz Meier 359989a2eb Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc 2013-01-06 11:25:24 +01:00
Lorenz Meier d3fd3d8219 Merged, compiling 2013-01-06 11:25:17 +01:00
Andrew Tridgell 0fff8aa23b GPS: added comment on units for variance 2013-01-02 17:38:28 +11:00
Lorenz Meier 4eb7df6ff5 Introduced battery_status uORB topic, changed sensors app to publish to it, extended px4io driver to publish to it. Both do only so if the battery voltage is reasonably high, at 3.3V 2013-01-01 13:30:24 +01:00
Lorenz Meier 2577e1a749 Removed compile errors, removed non-wanted MAVLink dependency in commander app 2012-12-30 11:01:09 +01:00
Lorenz Meier e2196bca4f Added position lock check 2012-12-27 18:36:37 +01:00
Lorenz Meier f5bad08bd0 Cleaned up control mode state machine / flight mode / navigation state machine still needs a bit cleaning up 2012-12-27 18:27:08 +01:00
Lorenz Meier 4cf2266b79 Robustified actuator output topic, added number of mixed outputs 2012-12-22 00:47:52 +01:00
Lorenz Meier 1fc0a6546e Merged IO feature branch 2012-12-13 11:12:34 +01:00
Lorenz Meier 03076a72ca Added required additional fields: If system is ok to launch (required for LED indicator), if system is ok to override fully by RC (required for multirotors which should not support this), desired PWM output rate in Hz (again required for some multirotors). 2012-12-13 10:23:02 +01:00
Lorenz Meier 126e6ac207 Enabled manual override switch, work in progress. Added initial demix testing code to support delta mixing on the remote for convenient manual override 2012-12-01 16:30:21 +01:00
Lorenz Meier 98283e16b0 Merged 2012-11-27 17:27:52 +01:00
Lorenz Meier caf0fefa32 Cleaned up different uorb topics, cleaned up excessive stack sizes 2012-11-27 17:24:33 +01:00
Lorenz Meier 90b94b5050 Ported all mixers to actuator_controls_effective topic, mixers do not output the limited result yet 2012-11-27 11:53:50 +01:00