1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-05 13:24:11 +01:00
Commit Graph

95 Commits

Author SHA1 Message Date
sambas
1823135573 Android Map widget tests
gitignore eclipse .metadata
2013-03-28 18:32:25 +02:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.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/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.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
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
2012-10-10 08:27:11 -05:00
James Cotton
1a1aa85d1a AndroidGCS: Remove the old fake telemetry 2012-10-10 00:22:21 -05:00
James Cotton
dae9cbc76d Merge branch 'android' into revo 2012-10-05 08:47:20 -05:00
James Cotton
94c5b30e68 Android: Make the icon smaller so the USB permission dialog works. 2012-10-03 00:16:10 -05:00
James Cotton
42a11788f9 AndroidGCS Controller: Make the default value mode 2
Previously typed "Mode 2" but it wants the integer value for the
default setting.  This stops a crash when no configuration.
2012-08-30 12:14:07 -05:00
James Cotton
b34b806772 AndroidGCS Controller: Make the default value mode 2
Previously typed "Mode 2" but it wants the integer value for the
default setting.  This stops a crash when no configuration.
2012-08-30 12:13:29 -05:00
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
0f29f6e403 AndroidGCS Controller: Use the controller mode preference to select mode1 versus mode2 2012-08-30 11:00:50 -05:00
James Cotton
3488f0d2a2 AndroidGCS Controllre: Add an option for mode 1 or mode 2 2012-08-30 10:36:46 -05:00
James Cotton
0f28f65be6 AndroidGCS PFD: Update the graphics for the PFD 2012-08-30 01:01:53 -05:00
James Cotton
cffeb6c65a AndroidGCS Tuning: Improvements to the tablet layout. 2012-08-29 23:34:04 -05:00
James Cotton
e2fdc95540 AndroidGCS: Use a relative layout for the object browser view. 2012-08-29 22:59:10 -05:00
James Cotton
12f0c18049 AndroidGCS: Check in some layouts for greater than 600px width 2012-08-29 21:59:53 -05:00
James Cotton
71d5f9d090 AndroidGCS Tuning: Fix the callbacks for the scroll and edit boxes so both can work.
Also added an attribute for the maximum value for the scroll range.
2012-08-29 03:19:49 -05:00
James Cotton
2a4adbda38 AndroidGCS Tuning: Add custom attributes so we can specify the name of the tuning bars from the layout file.
Hopefully we can programmatically link them to the StabilizationSettings and create a smart Apply/Save button similarly to the GCS implementation.
2012-08-28 16:06:52 -05:00
James Cotton
7c48b46adf AndroidGCS Tuning: Create a view that includes a scroll bar and edit box coupled together. 2012-08-28 15:12:53 -05:00
James Cotton
fed39f3893 AndroidGCS: Add launcher button for tuning. 2012-08-28 13:48:13 -05:00
James Cotton
5ec44d3407 Merge branch 'android_osg' into android_revo
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
2012-08-24 20:26:04 -05:00
James Cotton
b9e20ad0b7 AndroidGCS OSG: Add the OSG view to the main launcher page 2012-08-21 11:02:57 -05:00
James Cotton
129edf4398 AndroidGCS OSG: Get context showing 2012-08-21 00:04:26 -05:00
James Cotton
dc90210cfa AndroidGCS: Add support for HID to AndroidGCS 2012-08-16 03:43:10 -05:00
James Cotton
6fe2cb7738 Merge branch 'android_hid' into android_revo
Conflicts:
	androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
2012-08-11 14:53:04 -05:00
James Cotton
de2f6a64e2 AndroidGCS: Add support for HID to AndroidGCS 2012-08-10 23:19:47 -05:00
James Cotton
d14ad1c354 Check in some missing artwork 2012-08-10 10:15:32 -05:00
James Cotton
fcb3e8c152 AndroidGCS: Check in a FragmentTester class and add it to the home page.
Use it to the beginnings of the MapPosition fragment.
2012-08-08 19:15:03 -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
dd0a5b2cf2 AndroidGCS: Make home page buttons more vertical to work better on phones.
Maybe someone could make these automatically space out?
2012-08-08 13:17:30 -05:00
James Cotton
11a08c186c AndroidGCS: Refactor the Fragments into their own package to keep the UI
"components" segregated.  Is this good practice though?  It means making a lot
of functions for the API between ObjectManagerActivity and Fragment public.
2012-08-08 13:14:38 -05:00
James Cotton
ae36f39f1a AndroidGCS: Show some less shitty graphics for PFD 2012-08-08 12:20:29 -05:00
James Cotton
6bed9fcb3c AndroidGCS: Create a fragment API.
The ObjectManagerFragment will automatically registers against the
activity to be notified when an onOPConnected or onOPDisconnected method
occurs.  The Fragment API also duplicates the registerObjectUpdates(UAVObject)
method from ObjectManagerActivity so that it's objectUpdated() method is called
whenever and using the appropriate UI thread.
2012-08-08 08:37:35 -05:00
James Cotton
19b5cf4616 AndroidGCS: In the SystemAlarms display rank fields by alarm severity. Also
make hte fake telemetry object generate alarms.
2012-08-06 16:55:02 -05:00
James Cotton
a3038af4ad AndroidGCS: An ugly system alarms gadget that lists all the alarm values 2012-08-06 16:55:02 -05:00
James Cotton
f3dd96ed1d AndroidGCS: Add a telemetry monitor to the action bar that shows the TX/RX data
rate.  Right now seem to have a bug when going into the same widget twice it
crashes teh second time.
2012-08-06 16:55:02 -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
0601fd8b33 AndroidGCS: Add a launcher icon for the SystemAlarms gadget 2012-08-06 16:55:01 -05:00
James Cotton
a5933b7af5 AndroidGCS: Logger now displays the number of bytes and objects logged. 2012-08-06 16:55:01 -05:00
James Cotton
0274c8c860 AndroidGCS: Check in the stubs for a logging activity which will eventually
move into the service and this will become the control interface.
2012-08-06 16:55:01 -05:00
James Cotton
51765f4033 AndroidGCS: Missed some map icons 2012-08-06 16:55:01 -05:00
James Cotton
bebeb78a06 AndroidGCS: Update the API key for my debugging key. I guess everyone testing
will need to merge in their own key for hte location engine.
2012-08-06 16:55:00 -05:00
James Cotton
4c1171e1fb AndroidGCS: Joystick can now control UAV 2012-08-06 16:54:59 -05:00
James Cotton
6ff3378dbe AndroidGCS: Add load button to the object browser. 2012-08-06 16:54:59 -05:00
James Cotton
48701f3252 Fixup: Make browser use a smaller column width for the list of objects than
their contents
2012-08-06 16:54:59 -05:00
James Cotton
410aec8c94 AndroidGCS: Controller gadget that uses virtual joypad to control UAV 2012-08-06 16:54:58 -05:00
James Cotton
8982765307 AndroidGCS: Clean up start page and improve the icons. 2012-08-06 16:54:58 -05:00
James Cotton
91b2d667c1 AndroidGCS: Hardcode some dimensions on the editor dialog so the keyboard fits
more nicely with it.
2012-08-06 16:54:58 -05:00
James Cotton
3a3ac552da AndroidGCS: Refine the graphics of the object editor 2012-08-06 16:54:57 -05:00
James Cotton
b7cd02c9bf AndroidGCS: Refactor the UAVO browser to use a split view - objects names on
the side and content on the other side.  Add a filter for settings versus data.
2012-08-06 16:54:56 -05:00
James Cotton
20b585383d Make port and bluetooth adapter be listed in the preferences. Using the BT
adapter not working yet.
2012-08-06 16:54:56 -05:00
James Cotton
45f4ae0701 Allow selecting the IP address from the preferences 2012-08-06 16:54:56 -05:00