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 |
|
Stacey Sheldon
|
f5db83bd20
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
|
2012-07-22 23:39:37 -04:00 |
|
Stacey Sheldon
|
922c9b3519
|
simposix: include new GPS UAVOs for GPS module
|
2012-07-21 14:42:34 -04:00 |
|
Corvus Corax
|
79b717b4f7
|
Fixes to PathFollowers
|
2012-05-24 23:28:13 +02:00 |
|
Corvus Corax
|
4aa1391dce
|
updated SimPosix to test pathplanner and pathfollower functionality
|
2012-05-24 18:43:25 +02:00 |
|
Corvus Corax
|
414310fcba
|
test add of SimPosix architecture - doesnt work yet
|
2012-05-22 18:28:42 +02:00 |
|