Stacey Sheldon
|
754f58c33a
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-09-16 09:56:35 -04:00 |
|
James Cotton
|
4d87af38b6
|
Make sure the orders of the UAVOs match
|
2012-09-10 10:52:05 -05:00 |
|
James Cotton
|
a9af53b4f3
|
Create new autotuning module which rotates through the axes for autotuning and
then computes new stabilization settings.
|
2012-08-03 09:37:44 -05:00 |
|
Corvus Corax
|
84a0fd731f
|
Added ReturnToBase flightmode and correct behaviour in ManualControl
|
2012-05-21 12:10:01 +02:00 |
|
James Cotton
|
0f2c41ac5d
|
Merge branch 'revolution' into navigation
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
|
2012-05-07 21:53:10 -05:00 |
|
James Cotton
|
3155324384
|
Merge branch 'next' into cc3d
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
shared/uavobjectdefinition/ahrscalibration.xml
shared/uavobjectdefinition/ahrssettings.xml
shared/uavobjectdefinition/attituderaw.xml
|
2012-05-03 16:31:49 -05:00 |
|
Brian Webb
|
eb6f175af4
|
Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual).
|
2012-04-21 11:59:14 -07:00 |
|
James Cotton
|
3eac69e953
|
Create stub for waypoint navigation
|
2012-04-03 03:42:32 -05:00 |
|
James Cotton
|
1783817b96
|
INS: First pass at altitude hold code
|
2011-09-13 01:44:53 -05:00 |
|
James Cotton
|
ae841d57cb
|
OP-475: New FlightStatus object. Removed from ManualControlCommand. Won't
build yet.
|
2011-05-07 12:45:35 -05:00 |
|