Commit Graph

13526 Commits

Author SHA1 Message Date
Lorenz Meier ec49c72a8b Merge branch 'seatbelt_multirotor_new' of github.com:PX4/Firmware into fmuv2_bringup_new_state_machine_drton 2013-08-20 16:24:29 +02:00
Anton Babushkin db950f7489 position_estimator_inav: "landed" detector implemented, bugfixes 2013-08-20 12:17:15 +02:00
Lorenz Meier 7cff9b1e84 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup_new_state_machine_drton 2013-08-20 09:41:16 +02:00
Lorenz Meier 16559313db Merged calibration_cleanup 2013-08-20 09:17:28 +02:00
Lorenz Meier deb426b660 Merge branch 'sensor_selftests' 2013-08-19 22:51:30 +02:00
Lorenz Meier 1e96633907 Merged seatbelt_multirotor_new / master 2013-08-19 19:04:10 +02:00
Lorenz Meier 69a183e221 Merged master 2013-08-19 18:51:25 +02:00
Anton Babushkin 449dc78ae6 commander, multirotor_pos_control, sdlog2: bugfixes 2013-08-19 18:33:04 +02:00
Lorenz Meier 24d8ca5092 Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup_new_state_machine_drton 2013-08-19 17:37:22 +02:00
Lorenz Meier f4b5a17a7b Improved sensor startup and error checking 2013-08-19 17:35:07 +02:00
Lorenz Meier a9743f04be Fixed status changed flag 2013-08-19 15:09:06 +02:00
Lorenz Meier 9610f7a0d7 Fixed merge compile errors 2013-08-19 09:53:00 +02:00
Lorenz Meier c57b345e70 merged 2013-08-19 09:44:42 +02:00
Anton Babushkin f96bb824d4 multirotor_pos_control: reset integrals when disarmed 2013-08-19 09:31:33 +02:00
Lorenz Meier 28bf8e238e Merge branch 'master' of github.com:PX4/Firmware into vector_control 2013-08-19 09:05:16 +02:00
Anton Babushkin 3370ceceaf vehicle_control_mode.flag_armed added, reset integrals in multirotor_att_control when disarmed 2013-08-19 08:43:16 +02:00
Anton Babushkin ffc2a8b7a3 vehicle_local_position topic updated, position_estimator_inav and commander fixes, only altitude estimate required for SETBELT now. 2013-08-18 23:05:26 +02:00
Lorenz Meier e5f1a7c2c3 Better transparency in IO mode display, fixes to commander arming, minimum publishing rate for arming 2013-08-18 12:42:24 +02:00
Lorenz Meier e597f97982 Merged master 2013-08-18 12:04:07 +02:00
Julian Oes bc717f1715 Sensors should now take into account the orientation of an external mag 2013-08-18 09:33:59 +02:00
Lorenz Meier 061be7f7fe Merged master 2013-08-17 20:30:52 +02:00
Lorenz Meier 628e806df5 Minor style changes 2013-08-17 18:48:14 +02:00
Lorenz Meier eda528157a Make state updates atomic (just to be really, really sure) 2013-08-17 18:40:28 +02:00
Lorenz Meier 36d474bfa3 WIP on getting low-priority non-command tasks out of the commander main loop 2013-08-17 18:39:46 +02:00
Julian Oes 74802f0692 Added possibility to set board orientation 2013-08-17 18:06:39 +02:00
Lorenz Meier 6ff3f51f88 Added dim RGB led support, not operational yet 2013-08-17 15:47:42 +02:00
Lorenz Meier 6c45d9cb5c Fixed in-air timout, bumped protocol version 2013-08-17 15:47:13 +02:00
Anton Babushkin 2be5240b9f commander, multirotor_att_control, position_estimator_inav: position valid flag fixed, other fixes and cleaunup 2013-08-17 12:37:41 +02:00
Jean Cyr bafc5ea8a1 Remoce C++ style Doxygen comments
Replace C++ style comments with C comments
2013-08-16 18:35:52 -04:00
Anton Babushkin c543f89ec1 commander, multirotor_pos_control, multirotor_att_control: bugfixes 2013-08-16 23:36:49 +02:00
Anton Babushkin 4882bc0f1c position_estimator_inav: fixed global_pos topic publishing 2013-08-16 21:24:19 +02:00
Julian Oes 451adf2aa0 Added part of RGBLED stuff to commander 2013-08-16 18:05:59 +02:00
Lorenz Meier 52d15ac7b1 Merged public master 2013-08-16 16:22:38 +02:00
Anton Babushkin 63af0a80ee multirotor_att_control: run rate controller only if vehicle_control_mode flag set, codestyle fixed 2013-08-16 15:08:10 +02:00
Lorenz Meier 57f8fe3719 merged master, updated fixed wing 2013-08-16 14:44:00 +02:00
Anton Babushkin f78666e0c8 Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new
WIP, TODO fixedwing
2013-08-16 13:23:33 +02:00
Julian Oes 2c6570cec8 Forgot load change in mavlink_onboard 2013-08-16 10:20:04 +02:00
Julian Oes 02c23c785e System status load is now from 0 to 1 instead of non-intuitive 0 to 1000 2013-08-16 10:17:57 +02:00
Julian Oes ec9de4ad84 Critical voltage now leads to a proper arming state transition 2013-08-16 09:27:05 +02:00
Lorenz Meier 3f9f1d60e0 Added audio and text warning if arming is refused due to mode switch 2013-08-16 09:23:39 +02:00
Jean Cyr ab80b0e273 Doxygenate and style dsm.c
One file a day... this'll take a while!
2013-08-15 19:51:36 -04:00
Julian Oes d75c3c4e73 Try to open RGBLEDs in commander (WIP) 2013-08-15 17:48:28 +02:00
Julian Oes 98f403002f Lov voltage warning should work again 2013-08-15 17:29:27 +02:00
Julian Oes f51320d1af Lov voltage warning should work again 2013-08-15 17:27:29 +02:00
Julian Oes 56575eb068 Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
	src/drivers/blinkm/blinkm.cpp
	src/drivers/px4io/px4io.cpp
	src/modules/commander/state_machine_helper.c
	src/modules/px4iofirmware/protocol.h
	src/modules/px4iofirmware/registers.c
	src/modules/systemlib/systemlib.h
	src/systemcmds/reboot/reboot.c
2013-08-15 14:04:46 +02:00
Lorenz Meier 74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +02:00
Julian Oes 561ec495b7 Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton
Conflicts:
	Documentation/flight_mode_state_machine.odg
2013-08-15 10:43:11 +02:00
Anton Babushkin 7476b03543 Merge branch 'master' into new_state_machine_drton 2013-08-15 10:33:45 +02:00
Julian Oes 39ae01dd07 Fix the low priority loop, calibration routines work again 2013-08-15 10:31:35 +02:00
Julian Oes e5af29be17 Fixed param save and load 2013-08-15 10:21:58 +02:00