28 Commits

Author SHA1 Message Date
Julian Oes
1c7e07d8d7 Topics: Move from global_position_setpoint to mission_item_triplet 2013-12-26 21:41:54 +01:00
Thomas Gubler
c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/drivers/px4io/px4io.cpp
2013-12-13 21:07:27 +01:00
Julian Oes
69888d28a5 Navigator: Added onboard mission (not usable yet) 2013-11-29 10:06:01 +01:00
Julian Oes
3f25298798 Mavlink and navigator: Disable some functions in mavlink that are taken over by navigator, introduce topic to report mission status from commander back to mavlink 2013-11-27 09:27:08 +01:00
Julian Oes
a6c5a19206 Mission topic: Use mission topic instead of global position for triplet 2013-11-20 12:46:25 +01:00
Anton Babushkin
63d81ba415 actuator_controls_effective topic removed 2013-11-16 23:16:09 +04:00
Jean Cyr
1cf9f72f62 Add data manager module and fence support to navigator
- Add function to geo.c to determine if global position is inside fence
- Add navigator support/commands for maintaining fence coords.
- Add data manager module to support persistence fence storage. Can
store other data, but only used for fence at this time.
- Add unit tests for data manager
2013-11-03 12:40:13 -05:00
Andrew Tridgell
f12794d30e uORB: added new servorail_status object
used for VSERVO and RSSI on FMUv2
2013-09-12 09:24:40 +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
Lorenz Meier
74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +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
Anton Babushkin
5937c3a31b uORB topic vehicle_global_velocity_setpoint added 2013-07-12 16:30:11 +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
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
Lorenz Meier
614bbb1510 Merged ETS airspeed driver 2013-05-09 15:58:23 +02:00
Lorenz Meier
13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00