Alessio Morale
|
1a38b7eb46
|
Merge remote-tracking branch 'origin/amorale/02_os-stac_logfs-unittests' into next
Conflicts:
flight/targets/RevoMini/Makefile
flight/targets/Revolution/Makefile
|
2013-03-23 15:13:05 +01:00 |
|
Alessio Morale
|
e06ab7f706
|
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
|
2013-03-23 14:37:19 +01:00 |
|
Stacey Sheldon
|
bcb66764e2
|
logfs: use logfs on all targets that have serial flash
Conflicts:
flight/targets/FlyingF4/Makefile
flight/targets/FlyingF4/System/pios_board.c
flight/targets/Freedom/Makefile
flight/targets/Freedom/System/pios_board.c
flight/targets/Quanton/Makefile
flight/targets/Quanton/System/pios_board.c
flight/targets/board_hw_defs/flyingf4/board_hw_defs.c
flight/targets/board_hw_defs/freedom/board_hw_defs.c
flight/targets/board_hw_defs/quanton/board_hw_defs.c
|
2013-03-03 14:33:01 +01:00 |
|
Corvus Corax
|
7642f44cad
|
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
|
2013-02-03 14:57:54 +01:00 |
|
Stacey Sheldon
|
dbcf440bb9
|
makefile: factor out paths for major flight components
Conflicts:
flight/targets/CopterControl/Makefile
|
2013-01-28 02:01:39 +02:00 |
|
Stacey Sheldon
|
69a2691bc2
|
rename: move board-specific dirs into flight/targets
Conflicts:
flight/targets/Bootloaders/Revolution/Makefile
flight/targets/CopterControl/Makefile
|
2013-01-28 01:52:44 +02:00 |
|