Mike LaBranche
|
bf591ebe45
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 15:38:57 -07:00 |
|
Stacey Sheldon
|
d1d123e4f6
|
revo bl: turn on USB and add support for OP DFU protocol
|
2012-03-07 19:53:17 -05:00 |
|
Stacey Sheldon
|
e2939dae2a
|
revo usb: Add support for USB to Revo
|
2012-02-07 02:25:31 -05:00 |
|
James Cotton
|
fe7b9a909a
|
LED: Update the LEDs on revo
|
2012-01-26 09:11:27 -06:00 |
|
James Cotton
|
bb0bfe0ae4
|
Merge branch 'next' into revolution3
Conflicts:
flight/Bootloaders/CopterControl/Makefile
flight/Bootloaders/PipXtreme/Makefile
flight/Bootloaders/Revolution/inc/pios_config.h
flight/CopterControl/Makefile
flight/INS/inc/pios_config.h
flight/Libraries/taskmonitor.c
flight/Modules/Altitude/altitude.c
flight/Modules/Attitude/attitude.c
flight/OpenPilot/Makefile
flight/OpenPilot/Makefile.posix
flight/OpenPilot/System/inc/pios_usb_board_data.h
flight/OpenPilot/System/inc/taskmonitor.h
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/System/taskmonitor.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_bmp085.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/pios.h
flight/Revolution/System/inc/pios_config.h
flight/Revolution/System/inc/taskmonitor.h
flight/Revolution/System/taskmonitor.c
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
shared/uavobjectdefinition/systemalarms.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-01-21 11:27:03 -06:00 |
|
James Cotton
|
ec84fc4058
|
Get the Revolution bootloader working
|
2011-11-13 17:13:42 -06:00 |
|