James Cotton 38e9d105aa Merge branch 'pidt1' into test2 ...

Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml

2012-09-10 14:37:52 -05:00

..

Boards

Merge branch 'pidt1' into test2

2012-09-10 14:37:52 -05:00

Common

RFM22b: Get rid of the burst read commands and do a block transfer

2012-09-08 12:39:14 -05:00

inc

RFM22b: Abstract out the port into the driver initiation

2012-09-08 12:38:54 -05:00

STM32F4xx

Merge branch 'next' into revo

2012-09-01 16:18:03 -05:00

STM32F10x

pipx: ensure pipx BL image is padded to fill its bank

2012-09-05 22:17:04 -04:00

pios.h

PIOS_OVERO driver which handles the communications to the overo and ensures the

2012-07-17 15:34:54 -05:00