1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight
James Cotton f530702ce9 Merge branch 'android' into sim_android
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/layout/pfd.xml
	androidgcs/res/layout/system_alarms.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java
	androidgcs/src/org/openpilot/androidgcs/CompassView.java
	androidgcs/src/org/openpilot/androidgcs/Controller.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	androidgcs/src/org/openpilot/androidgcs/Logger.java
	androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
	androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java
	androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
	androidgcs/src/org/openpilot/androidgcs/Preferences.java
	androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java
	androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
	androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
	androidgcs/src/org/openpilot/uavtalk/Telemetry.java
	androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
	androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
	androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java
	androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
	flight/Modules/GPS/GPS.c
2012-08-08 15:50:28 -05:00
..
board_hw_defs Fix the PIOS_OVERO dma IRQ configuration 2012-07-20 11:14:27 -05:00
Bootloaders Merge branch 'next' into revo 2012-06-07 12:45:06 -05:00
CopterControl Merge branch 'android' into sim_android 2012-08-08 15:50:28 -05:00
Doc Merged latest origin/next. 2012-05-05 09:40:44 -07:00
EntireFlash makefile: add additional context to output when building all_* targets 2012-06-20 23:38:21 -04:00
Libraries Merge branch 'android' into sim_android 2012-08-08 15:50:28 -05:00
Modules Merge branch 'android' into sim_android 2012-08-08 15:50:28 -05:00
OpenPilot/System Merged latest origin/next. 2012-05-05 09:40:44 -07:00
PiOS Change the constant so LED flashing works properly on Revo 2012-07-28 11:22:24 -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-07-13 10:40:14 -05:00
PiOS.win32 Delete some old files 2012-04-03 09:16:28 -05:00
PipXtreme Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-07-15 12:32:35 -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 Remove the TCHAIN_PREFIX flag from the OSX Makefile. No clue how that got 2012-08-06 16:54:55 -05:00
SimPosix simposix: include new GPS UAVOs for GPS module 2012-07-21 14:42:34 -04:00
UAVObjects uavobjectmanager: remove uavo name field and related functions 2012-07-07 21:49:53 -04:00
UAVTalk Fix a really stupid bug where I ordered two cases together; 2012-07-24 11:07:40 -05:00
README.txt Says all it needs to say for now. 2009-12-22 05:07:27 +00:00

Check the wiki