Commit Graph
334 Commits
Author SHA1 Message Date
Anton Babushkin f78666e0c8 Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new
WIP, TODO fixedwing
2013-08-16 13:23:33 +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
Lorenz Meier 74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +02:00
Anton Babushkin 8c1067a017 State machine rewritten, compiles, WIP 2013-07-28 23:12:16 +04:00
Anton Babushkin 7c1693a877 commander: don't notify user about rejected disarm to not confuse, flag_control_altitude_enabled added, flags values fixed 2013-07-23 14:56:12 +04:00
Anton Babushkin 55fd19f281 sensors: ASSISTED switch channel added 2013-07-22 22:37:10 +04:00
Anton Babushkin 963abd66ba commander: WIP, SEATBELT renamed to ASSISTED, added SIMPLE mode, added ASSISTED switch, some cleanup and reorganizing 2013-07-22 21:48:21 +04:00
Anton Babushkin c6d184e29d Merge branch 'master' into seatbelt_multirotor 2013-07-17 19:16:49 +04:00
Julian Oes bcdedd9a35 Changed location of lots of flags and conditions, needs testing and more work 2013-07-16 18:56:31 +02:00
Julian Oes 1b38cf715d Renamed actuator_safety back to actuator_armed, compiling but untested 2013-07-15 22:15:15 +02:00
Lorenz Meier bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Simon Wilks 1ccfb623ee Merge remote-tracking branch 'upstream/master' into hott-esc 2013-07-13 01:08:45 +02:00
Simon Wilks b500cce31e Major refactor of HoTT drivers and finished sensor read implementation. 2013-07-13 01:08:06 +02:00
Anton Babushkin 5937c3a31b uORB topic vehicle_global_velocity_setpoint added 2013-07-12 16:30:11 +04:00
Anton Babushkin 1d986d6c04 sdlog2: Global Position Set Point message added, vehicle_global_position_setpoint topic fixed 2013-07-12 10:09:38 +04:00
Lorenz Meier ced2871263 Merged mkblctrl 2013-07-08 20:48:30 +02:00
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
Lorenz Meier 5691c64ff0 Update to uORB topics, added / improved position triplet, added radio status 2013-07-04 15:39:29 +02:00
marco 209dc7100e mkclctrl 8/11Bit support, uOrb Topic added, ESC Topic to Sdlog2 added 2013-07-02 19:46:15 +02:00
Julian Oes f052442c2b Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/modules/sdlog2/sdlog2.c
	src/modules/sdlog2/sdlog2_messages.h
2013-06-27 09:23:11 +02:00
Anton Babushkin fdc7247fcf sdlog2: FLOW message added, bug fixed in optical_flow topic 2013-06-25 21:04:08 +04:00
Julian Oes a6ba7e4485 Dropped superseded safety topic, added warning tones before arming 2013-06-25 13:15:38 +02:00
Julian Oes 202792294a Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +02:00
Julian Oes b52d561b11 Added ctrl debugging values 2013-06-16 12:59:50 +02:00
Julian Oes 3230f22446 Merge branch 'pid_fixes' into new_state_machine 2013-06-15 20:06:30 +02:00
Julian Oes 9f5565de32 Controllers should not access state machine anymore but access the vehicle_control_mode flags 2013-06-15 19:41:54 +02:00
samuezih b789e01a0f Add PX4Flow board modules and corresponding ORB msgs. 2013-06-14 17:31:46 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Lorenz Meier 1deced7629 Added safety status feedback, disallow arming of a rotary wing with engaged safety 2013-06-09 14:09:09 +02:00
Julian Oes f5c157e74d Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
2013-05-17 11:24:02 +02:00
Lorenz Meier 79f9b61aff Fixed led patterns to be up to the latest specs 2013-05-12 20:05:20 +02:00
Lorenz Meier 614bbb1510 Merged ETS airspeed driver 2013-05-09 15:58:23 +02:00
px4dev 8d3a738b70 Remove some trash files. 2013-04-28 13:00:32 -07:00
Lorenz Meier 13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00