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

..

FreeRTOSConfig.h

Revert "OP-1810 FOC"

2015-07-15 00:07:50 +02:00

openpilot.h

Revert "OP-1810 FOC"

2015-07-15 00:07:50 +02:00

pios_board_posix.h

Revert "OP-1810 FOC"

2015-07-15 00:07:50 +02:00

pios_config_posix.h

Revert "OP-1810 FOC"

2015-07-15 00:07:50 +02:00

pios_config.h

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_usb_board_data.h

Revert "OP-1810 FOC"

2015-07-15 00:07:50 +02:00