Richard Flay (Hyper)
cf14608ebe
Merge branch 'next' into hyper/OP-936_task-monitor-rework
2013-05-09 19:25:02 +09:30
Alessio Morale
93bad2e8c2
Merge branch 'amorale/OP-917_f4_bootloader_updater' into next
...
***** PLEASE NOTE ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version 5 to boot properly
Conflicts:
flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
flight/targets/boards/osd/board-info.mk
make/boot-defs.mk
make/common-defs.mk
2013-05-07 21:02:41 +02:00
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)
a2d8544931
OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required
...
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.
+review OPReview-459
2013-05-05 16:32:24 +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
Sambas
f7b9223827
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
2013-05-02 09:00:12 +03:00
Corvus Corax
a0ca66b0cd
Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next
2013-05-01 15:34:16 +02:00
Alessio Morale
e1fdc41d7f
OP-917 add Bootloader support for IRQStack to reside in CCSRAM
...
+review OPReview-456
2013-05-01 01:03:27 +02:00
Alessio Morale
1eef6a7f06
OP-917 Extended the program flash size to 3 128k sectors for F4 targets
...
+review OPReview-456
2013-05-01 01:00:48 +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
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +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
f20f89da35
Rename PiOS/Common->PiOS/common
2013-04-25 13:13:39 +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
