Stacey Sheldon
|
2119067722
|
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
|
2012-10-30 00:08:43 -04:00 |
|
James Cotton
|
72c84fc49c
|
Upgrade to FreeRTOS 7.2.0
|
2012-10-09 09:48:02 -05:00 |
|
Sambas
|
a9cfc4a0af
|
*float sprintf
*h/v deadbands
|
2012-05-25 21:12:03 +03:00 |
|
Sambas
|
8cc876d02a
|
OSD branch
|
2012-02-12 22:29:42 +02:00 |
|
Stacey Sheldon
|
57f9f6e3d1
|
f4 usb: configure and build ST USB OTG and USB DEV libraries
|
2012-02-07 02:25:31 -05:00 |
|
James Cotton
|
7c22215e0b
|
Patch from Sambas to fix F4 on windows
|
2012-01-24 10:33:07 -06:00 |
|
James Cotton
|
8b42fbeafc
|
Revert "Fix case in library.mk to stop Brian bitching :)"
This reverts commit d39e818ca6.
|
2012-01-08 09:27:13 +01:00 |
|
James Cotton
|
d39e818ca6
|
Fix case in library.mk to stop Brian bitching :)
|
2012-01-08 09:10:56 +01:00 |
|
James Cotton
|
ec84fc4058
|
Get the Revolution bootloader working
|
2011-11-13 17:13:42 -06:00 |
|
James Cotton
|
3388843fb5
|
Merge in PixHawk F4 work
|
2011-11-01 01:09:55 -05:00 |
|