Fredrik Arvidsson 02c981388a Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09 ...

# Conflicts:
#	flight/targets/boards/coptercontrol/board_hw_defs.c
#	flight/targets/boards/coptercontrol/firmware/pios_board.c
#	flight/targets/boards/revolution/board_hw_defs.c
#	flight/targets/boards/revolution/firmware/inc/pios_config.h
#	flight/targets/boards/revolution/firmware/pios_board.c
#	flight/targets/boards/revonano/firmware/inc/pios_config.h
#	flight/targets/boards/revonano/firmware/pios_board.c
#	shared/uavobjectdefinition/hwsettings.xml
#	shared/uavobjectdefinition/manualcontrolsettings.xml
#	shared/uavobjectdefinition/receiveractivity.xml

2016-01-09 16:59:24 +01:00

..

libraries

Uncrustify

2015-09-24 22:33:57 +02:00

make

Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09

2016-01-09 16:59:24 +01:00

modules

Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09

2016-01-09 16:59:24 +01:00

pios

Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09

2016-01-09 16:59:24 +01:00

Project

Signed cats

2014-11-21 11:53:47 +11:00

targets

Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09

2016-01-09 16:59:24 +01:00

templates

OP-1477 - remove debug infos and add send some relevant informations using SYS message (firmware and board revision/info)

2014-09-24 01:06:41 +02:00

tests

LP-99 Decouple flight build

2015-09-02 19:34:58 +12:00

uavobjects

LP-99 Decouple flight build

2015-09-02 19:34:58 +12:00

uavtalk

OP-1841 - Check available size at each step to avoid overrun

2015-04-20 05:48:39 +02:00

.gitattributes

Update flight/.gitattributes to include *.template files

2013-04-30 22:15:58 +02:00

Makefile

LP-99 Decouple flight build

2015-09-02 19:34:58 +12:00