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 |
|
Alessio Morale
|
22b211167c
|
Ported pios_iap.c to F4
restored failed boot count check on pios_board.c for revo
|
2012-02-11 13:49:32 +01:00 |
|
James Cotton
|
838370b3a4
|
Fix calls to backup registers on F4
|
2012-01-21 13:21:37 -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
|
0da6109871
|
Update the F4 copyright headers to 2012
|
2012-01-04 19:29:29 -06:00 |
|
James Cotton
|
9607da9c62
|
Add some drivers to the device specific library for now until the exti problems
are fixed
|
2011-11-01 03:19:58 -05:00 |
|