Corvus Corax
|
e1233c7780
|
Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
Conflicts:
flight/targets/Revolution/System/inc/openpilot.h
flight/targets/SimPosix/System/inc/openpilot.h
flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
flight/targets/boards/revolution/firmware/inc/openpilot.h
flight/targets/boards/revoproto/firmware/inc/openpilot.h
|
2013-04-27 13:26:03 +02:00 |
|
Oleg Semyonov
|
45f456580f
|
Fix pios debug pin functions and defines (thanks to Mathieu for the patch)
|
2013-04-26 18:18:31 +03:00 |
|
Oleg Semyonov
|
e2fd821e97
|
Merge remote-tracking branch 'origin/next' into sambas/diffnext
Conflicts:
make/common-defs.mk
|
2013-04-26 16:31:19 +03:00 |
|
sambas
|
e94c00e671
|
Fix revo BL compile error
|
2013-04-25 19:51:52 +03:00 |
|
sambas
|
abe3742217
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
|
2013-04-25 17:26:49 +03:00 |
|
Oleg Semyonov
|
66db978244
|
Rename Libraries->libraries, Modules->modules
|
2013-04-25 13:13:36 +03:00 |
|
Oleg Semyonov
|
8f784ac6cb
|
flight: remove unnecessary #include "systemmod.h" from boards
|
2013-04-24 22:35:34 +03:00 |
|
Oleg Semyonov
|
406339eb49
|
Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
Conflicts:
flight/Libraries/inc/op_dfu.h
flight/Libraries/op_dfu.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/OSD/op_dfu.c
flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
flight/targets/boards/coptercontrol/bootloader/op_dfu.c
flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
flight/targets/boards/oplinkmini/bootloader/op_dfu.c
flight/targets/boards/osd/bootloader/inc/op_dfu.h
flight/targets/boards/osd/bootloader/op_dfu.c
flight/targets/boards/revolution/bootloader/inc/op_dfu.h
flight/targets/boards/revolution/bootloader/op_dfu.c
flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
flight/targets/boards/sensortest/bootloader/op_dfu.c
make/boot-defs.mk
|
2013-04-24 00:37:39 +03:00 |
|
Oleg Semyonov
|
3f2431c04f
|
OP-899: move board-specific pios_board.h files into board directories
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
f7332f6905
|
OP-899: remove extra copy of pios_usb_data.c and move it level up
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
1dd20eca33
|
OP-899: move board_hw_defs.c under board directories and fix some includes
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
393b37fa7a
|
OP-899: move board-info.mk from make/boards to board directories
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
f7f842687a
|
OP-899: rename System to firmware and move Makefile into it
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
fce12662bc
|
OP-899: move bootloaders under board directories
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
f01655efed
|
OP-899: get rid of board_friendly names
|
2013-04-24 00:07:06 +03:00 |
|