Alessio Morale
|
57ca1639cc
|
Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next
Conflicts:
flight/Libraries/op_dfu.c
flight/PiOS/STM32F10x/pios_iap.c
flight/PiOS/inc/pios_iap.h
flight/targets/BootloaderUpdater/main.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/CopterControl/op_dfu.c
flight/targets/Bootloaders/OSD/inc/op_dfu.h
flight/targets/Bootloaders/PipXtreme/op_dfu.c
flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
flight/targets/Bootloaders/RevoMini/op_dfu.c
flight/targets/Bootloaders/Revolution/inc/op_dfu.h
flight/targets/Bootloaders/Revolution/op_dfu.c
ground/openpilotgcs/src/plugins/uploader/uploader.ui
make/apps-defs.mk
make/boot-defs.mk
|
2013-04-23 23:14:11 +02:00 |
|
Alessio Morale
|
09d2ba1d25
|
OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.
+review OPReview-421
|
2013-04-08 01:10:37 +02:00 |
|
Oleg Semyonov
|
5bb6b56b4a
|
OP-772: Normalize line endings
|
2013-04-05 23:46:56 +03:00 |
|
Oleg Semyonov
|
3c97b5a7c6
|
Clean up pios_config.h for BL, BU, some FW (not all yet)
Conflicts:
flight/targets/Bootloaders/CopterControl/inc/pios_config.h
|
2013-03-24 13:05:57 +02:00 |
|
Oleg Semyonov
|
f65ff0585f
|
Makefile: add make/common-defs.mk and use it to build bootloaders (STM32F10x)
Conflicts:
make/boot-defs.mk
|
2013-03-24 13:04:15 +02:00 |
|
Oleg Semyonov
|
75ef685c6e
|
Makefile: bootloader makefiles cleanup
Conflicts:
flight/targets/Bootloaders/CopterControl/Makefile
flight/targets/Bootloaders/OSD/Makefile
flight/targets/Bootloaders/PipXtreme/Makefile
flight/targets/Bootloaders/RevoMini/Makefile
flight/targets/Bootloaders/Revolution/Makefile
|
2013-03-24 13:04:01 +02:00 |
|
Oleg Semyonov
|
00a0ef430d
|
pios: fix pios_config.h (now PIOS_INCLUDE_COM_MSG requires PIOS_INCLUDE_COM)
|
2013-03-24 13:03:57 +02: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
|
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 |
|