Corvus Corax
d97934cf86
Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state
2013-05-19 22:05:48 +02:00
Alessio Morale
ab7af16be3
Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD
...
Conflicts:
flight/pios/stm32f10x/library.mk
flight/targets/boards/revoproto/firmware/pios_board.c
2013-05-19 15:01:08 +02:00
Corvus Corax
5284195c29
Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState
2013-05-18 19:36:45 +02:00
Brian Webb
bc4f615c25
Adds setting HSE_VALUE on all F1 targets (should only be necessary if the HSE clock is not 8MHz).
...
Moves the CMSIS system_stm3210x.c from library.mk to the individual Makefiles for the F1 targets. This allows for custom SystemInit functions where necessary.
2013-05-17 22:01:48 -07:00
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
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
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
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
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
