Commit Graph
24 Commits
Author SHA1 Message Date
Julian Oes f1058bdf08 manual_control_setpoint: wrong comment 2014-11-12 11:07:27 +10:00
Julian Oes 20703c8d23 manual_control_setpoint: whitespace 2014-11-12 11:05:06 +10:00
Anton Babushkin 950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +02:00
Anton Babushkin b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Thomas Gubler 15699549a2 manual control setpoint: add comment about sign 2014-05-12 13:35:11 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler d9333a1993 manual control setpoint: rename variables 2014-05-12 09:20:40 +02:00
Anton Babushkin c131e4cada manual_control_setpoint: comments fixed 2014-05-11 23:46:12 +02:00
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
TickTock- 6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock- 07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Anton Babushkin 63c50676f9 MISSION switch renamed to LOITER 2014-04-24 22:38:19 +02:00
TickTock- 7e621070ca renamed mission_switch to loiter_switch and assisted_switch to easy_switch 2014-04-22 18:23:27 -07:00
Anton Babushkin b00b70aeb2 manual_control_setpoint: signal_lost flag removed, sensors: bugs fixed 2014-04-05 16:06:10 +04:00
Anton Babushkin 1d5f62d890 sensors: use enum for switches position and -1..1 for values in 'manual_control_setpoint' topic 2014-04-03 17:26:07 +04:00
Anton Babushkin 367ce63b86 'signal_lost' flag added to manual_control_setpoint and rc_channels topics to indicate signal loss immediately 2014-04-03 11:45:57 +04:00
Anton Babushkin 7f4f9a5f5f ACRO mode implemented 2014-01-31 22:44:05 +01:00
Anton Babushkin 1dc9785083 OFFBOARD switch added, WIP 2014-01-22 16:52:35 +01: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
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 13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00