James Cotton 2f65fc1e8e Merge branch 'next' into relay_tuning ...

Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml

2012-09-04 10:43:04 -05:00

..

inc

Prevent an alarm from ManualControlCommand when using autotuning mode.

2012-08-03 09:37:47 -05:00

manualcontrol.c

Merge branch 'next' into relay_tuning

2012-09-04 10:43:04 -05:00