James Cotton
|
69328edd0d
|
Merge branch 'android' into revo-mini
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
|
2012-08-30 12:10:12 -05:00 |
|
James Cotton
|
0f28f65be6
|
AndroidGCS PFD: Update the graphics for the PFD
|
2012-08-30 01:01:53 -05:00 |
|
James Cotton
|
fed39f3893
|
AndroidGCS: Add launcher button for tuning.
|
2012-08-28 13:48:13 -05:00 |
|
James Cotton
|
d14ad1c354
|
Check in some missing artwork
|
2012-08-10 10:15:32 -05:00 |
|
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 |
|
James Cotton
|
1740bef847
|
AndroidGCS: Delete zip file of android icons
|
2012-08-08 14:25:52 -05:00 |
|
James Cotton
|
ae36f39f1a
|
AndroidGCS: Show some less shitty graphics for PFD
|
2012-08-08 12:20:29 -05:00 |
|
James Cotton
|
578689748b
|
AndroidGCS: Artwork for a telemetry monitor in the action bar
|
2012-08-06 16:55:02 -05:00 |
|
James Cotton
|
d18b3bbbf6
|
AndroidGCS: Add the device location to the map overlay. Improve the icons for
the UAV and home location.
|
2012-08-06 16:55:00 -05:00 |
|
James Cotton
|
8982765307
|
AndroidGCS: Clean up start page and improve the icons.
|
2012-08-06 16:54:58 -05:00 |
|
James Cotton
|
a47cec644f
|
AndroidGCS: Artwork for a telemetry monitor in the action bar
|
2012-08-06 06:59:48 -05:00 |
|
James Cotton
|
2094c37102
|
AndroidGCS: Add the device location to the map overlay. Improve the icons for
the UAV and home location.
|
2012-08-06 00:05:50 -05:00 |
|
James Cotton
|
b503286a00
|
AndroidGCS: Clean up start page and improve the icons.
|
2012-08-05 16:13:17 -05:00 |
|