Richard Flay (Hyper)
fbc8bc698f
OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,
...
and brings the callback scheduler into the fold.
+review OPReview-461
2013-05-06 19:11:14 +09:30
Richard Flay (Hyper)
84e1a81f8b
OP-936: Moves the task monitor code out of the flight library and into PiOS.
...
This move and rework also breaks the dependency of the task monitor on the UAVO subsystem,
and pushes the responsibility for updating the TaskInfo UAVO into the System module.
+review OPReview
2013-05-03 07:01:14 +09:30
Corvus Corax
a0ca66b0cd
Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next
2013-05-01 15:34:16 +02:00
Oleg Semyonov
7032d2a9d6
Merge remote-tracking branch 'origin/next' into os/uncrustify-config
2013-05-01 13:31:38 +02:00
Oleg Semyonov
7c6da1df65
OPLinkMini: remove duplicated pvPortMalloc defines, fix #ifdef macro name
...
When the #define is reformatted by uncrustify, it differs from the same
in FreeRTOS default config and gives error. So the removal of it serves
to 2 purposes: removes the duplication and fixes uncrustified builds.
2013-04-30 16:54:30 +02:00
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
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
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
