1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight
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
..
board_hw_defs RM: Make the direction of the TX/RX lines come from the configuration file 2012-09-04 23:22:56 -05:00
Bootloaders Copy the revo project to revo mini 2012-08-25 12:23:54 -05:00
CopterControl Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
Doc Merged latest origin/next. 2012-05-05 09:40:44 -07:00
EntireFlash ef: Add fwinfo to entireflash (EF) images 2012-09-05 21:45:59 -04:00
Libraries Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
Modules Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
OpenPilot/System Merged latest origin/next. 2012-05-05 09:40:44 -07:00
PiOS Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
PiOS.osx Add pios_struct_helper to PiOS.osx 2012-07-23 09:19:28 -05:00
PiOS.posix Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
PiOS.win32 Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
PipXtreme RFM22b: Added SPI initialization back into PipX pios_board.c. 2012-09-01 19:14:36 -05:00
Project gdb: add gdb setup file for simposix 2012-07-07 10:36:36 -04:00
RemoteSystemsTempFiles Merge branch 'next' into MikeL 2012-06-04 16:59:31 -07:00
Revolution Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
RevoMini Merge branch 'pidt1' into test2 2012-09-10 14:37:52 -05:00
SimPosix Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module 2012-08-01 19:53:59 +09:30
UAVObjects taskinfo: also track Event thread's stack usage and CPU utilization 2012-08-11 18:47:03 -04:00
UAVTalk Added UAVTalkSendBuf function and added locking in UAVTalkSendAck and UAVTalkSendNack. 2012-08-24 19:42:10 -07:00
README.txt Says all it needs to say for now. 2009-12-22 05:07:27 +00:00

Check the wiki