Stacey Sheldon
|
127ca1e7e1
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-10-20 13:56:18 -04:00 |
|
Laura Sebesta
|
8997df2438
|
Merge branch 'next' into kenz/diag_stack_split
Conflicts:
flight/Modules/Stabilization/stabilization.c
|
2012-09-27 19:29:23 +02:00 |
|
Laura Sebesta
|
4923655cd3
|
Added global flag for enabling all diagnostic tools.
|
2012-09-27 18:51:12 +02:00 |
|
Stacey Sheldon
|
566f9d760e
|
simposix: fix suplicate .c files in previous merge
|
2012-09-16 19:34:47 -04:00 |
|
Stacey Sheldon
|
ffe88eec5e
|
Merge remote-tracking branch 'op-public/next' into revo-next
|
2012-09-16 17:14:20 -04:00 |
|
Stacey Sheldon
|
05483e2a74
|
simposix: adapt simposix to addition of relay tuning
|
2012-09-16 15:40:47 -04:00 |
|
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 |
|
Laura Sebesta
|
f2ffd1fb99
|
Changed DIAGNOSTICS flag to be individual to each module instead of global.
The upshot is the stack usage monitor can be turned on at a lower RAM threshold.
|
2012-08-24 12:04:05 +02: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 |
|
Stacey Sheldon
|
a7da3b14ba
|
simposix: disable optimization for simposix build
Optimizing for size on simposix is meaningless, and
the code is easier to debug using gdb when optimization
is disabled.
|
2012-07-07 10:36:36 -04:00 |
|
Stacey Sheldon
|
c73cffce59
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
|
2012-06-10 19:01:11 -04:00 |
|
Mike LaBranche
|
0ba8345c51
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 16:59:31 -07: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
|
7f334a9773
|
SimPosix: make use of compile time uavobjecto initialization function generation
|
2012-05-22 22:06:26 +02:00 |
|
Corvus Corax
|
3e5741abea
|
SimPosix: Remove unneeded modules from Makefile to allow test run
|
2012-05-22 18:45:23 +02:00 |
|
Corvus Corax
|
9aca773714
|
SimPosix: Reenabled File IO for UAVObject saving
|
2012-05-22 18:32:52 +02:00 |
|
Corvus Corax
|
e16a42b672
|
SimPosix: Fixed Module Initialisation, added missing UAVObject Initialisations (cause segfaults if not initialised)
|
2012-05-22 18:32:41 +02:00 |
|
Corvus Corax
|
5727d5714e
|
Created new "SimPosix" board and ported PiOS.posix to revolution API and more "standard like" configuration akin to other "boards"
|
2012-05-22 18:32:27 +02:00 |
|
Corvus Corax
|
414310fcba
|
test add of SimPosix architecture - doesnt work yet
|
2012-05-22 18:28:42 +02:00 |
|