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

362 Commits

Author SHA1 Message Date
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
2bf8423ed6 AndroidGCS Map: Make sure to grab the correct uavLocation and homeLocation at startup 2012-08-30 12:10:17 -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
e85d959bf5 AndroidGCS Bluetooth: Fix crash when no paired devices
Previously tried to make it list "No devices" but this triggered other
crashes.
2012-08-30 09:45:12 -05:00
James Cotton
0f28f65be6 AndroidGCS PFD: Update the graphics for the PFD 2012-08-30 01:01:53 -05:00
James Cotton
2ca353992c AndroidGCS PFD: Properly center image now so it works over multiple sizes.
However, it doesn't automatically fill the screen in normal PFD view yet.  Specifying the width in pfd.xml directly does fix that but is incorrect.
2012-08-30 00:10:20 -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
fbefba69e2 AndroidGCS: For now force the min width of the ScrollBarView to 300dp
Because I don't know how to make it automatically expand to fill the columns.
This makes it get close until multiple layout sizes.
2012-08-29 22:00:46 -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
e9effa593d AndroidGCS Tuning: Finish the SmartSave utility 2012-08-29 03:21:42 -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
4a433d32f7 AndroidGCS Tuning: Connect the SmartSave button to the tuning page 2012-08-29 02:41:58 -05:00
James Cotton
5ed5e1170e AndroidGCS SmartSave: Begin implement a smart save architecture
This SmartSave class only associates with one UAVO.  However, you can instantiate multiple of these for the various objects.  Use addControlMapping to create new mappings between controls and UAVO fields.
2012-08-29 02:41:21 -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
2c21038d74 AndroidGCS AttitudeView: Fix the PFD display so it can be bigger.
The view on measure limits the size.  It was previous set to 200.  I made it bigger and made it respect the ON_MOST input.  Need to see if setting a huge number works across screen types.
2012-08-28 14:14:50 -05:00
James Cotton
fed39f3893 AndroidGCS: Add launcher button for tuning. 2012-08-28 13:48:13 -05:00
James Cotton
7b716bab08 Merge branch 'android' into revo-mini 2012-08-28 11:42:55 -05:00
James Cotton
b9663ba666 AndroidGCS: Fix typo in telem debug messages 2012-08-28 11:29:50 -05:00
James Cotton
ee97390ade AndroidGCS TelemetryTask: Make sure the telemetry task shuts down the reading thread on disconnect 2012-08-28 11:24:41 -05:00
James Cotton
846f488eb1 AndroidGCS: Suppress some warnings from Controller.java 2012-08-28 11:24:41 -05:00
James Cotton
120f9298b4 AndroidGCS: Suppress some warnings related to not implementing the STRING uavfield type properly. 2012-08-28 11:24:40 -05:00
James Cotton
f01edc5d72 AndroidGCS: Make sure the telemetry sevice checks there is a telemetry task AND it's connected before sending the OPConnected service. Otherwise the objMngr is undefined. 2012-08-28 11:24:40 -05:00
James Cotton
6cd9a9b0af AndroidGCS Bluetooth: Make bluetooth use the new connection system. 2012-08-28 11:24:40 -05:00
James Cotton
e65793a5d0 AndroidGCS PFD: Properly center image now so it works over multiple sizes.
However, it doesn't automatically fill the screen in normal PFD view yet.  Specifying the width in pfd.xml directly does fix that but is incorrect.
2012-08-27 12:23:00 -05:00
James Cotton
e68603ac6a AndroidGCS: Make sure the telemetry sevice checks there is a telemetry task AND it's connected before sending the OPConnected service. Otherwise the objMngr is undefined. 2012-08-27 09:53:23 -05:00
James Cotton
05fd56ede5 AndroidGCS: Suppress some warnings related to not implementing the STRING uavfield type properly. 2012-08-26 22:26:34 -05:00
James Cotton
d61a649491 AndroidGCS: Suppress some warnings from Controller.java 2012-08-26 22:05:53 -05:00
James Cotton
d2a12d8bd5 AndroidGCS: Clean up some warnings from OsgViewer 2012-08-26 22:04:40 -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
f37433e280 AndroidGCS OSG: Force inclusion of the 3DS plugin and use a 3DS model. Also include the jpeg and png libraries and plugins to load the textures. However they currently aren't visible. 2012-08-23 11:20:01 -05:00
James Cotton
08bb355749 AndroidGCS OSG: Increase OSG debugging level and try and include osgdb_3ds without success from the git build. 2012-08-22 22:34:20 -05:00
James Cotton
f60a6baf3e AndroidGCS OSG: Switch to hardcoded quad model instead of cow. The quad file was made from the 3DS models using
osgconv --enable-object-cache -s 0.01,0.01,0.01 --simplify 0.1 --smooth ~/Programming/OpenPilot/artwork/3D\ Model/multi/joes_cnc/J14-QT_X.3DS quad.osg
to get teh scaling normal for the screen too.
2012-08-21 15:24:07 -05:00
James Cotton
f8804574e8 AndroidGCS OSG: Clean up function API 2012-08-21 11:25:14 -05:00
James Cotton
4dbaa63931 AndroidGCS OSG: Register for attitude updates in the OSG view 2012-08-21 11:09:52 -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
616f488c6c AndroidGCS OSG: Add stub for rotating model 2012-08-21 10:30:20 -05:00
James Cotton
905a81844c AndroidGCS OSG: Now shows a cow. The model path is hardcoded. 2012-08-21 00:23:04 -05:00
James Cotton
129edf4398 AndroidGCS OSG: Get context showing 2012-08-21 00:04:26 -05:00
James Cotton
34b21bec3c AndroidGCS: OSG import basic OSG code 2012-08-20 22:56:21 -05:00
James Cotton
caff64ed7e AndroidGCS Telemetry: Fix the determination of whether a transaction is pending 2012-08-16 03:44:11 -05:00
James Cotton
b614368359 AndroidGCS Telemetry: Use a runnable for the transaction timeout. Now all of
telemetry is using handlers nicely, but we still can have multiple
transactions queued for the same object.
2012-08-16 03:44:11 -05:00
James Cotton
9f326f28d8 AndroidGCS: Handler based telemetry. Now reschedule transactions if one is
pending.
2012-08-16 03:44:11 -05:00
James Cotton
a78fd852b1 AndroidGCS Telemetry: Finish moving telemetry into a runnable. 2012-08-16 03:44:11 -05:00
James Cotton
319baa9e6f AndroidGCS: Start moving the telemetry object queue to a handler and a looper 2012-08-16 03:44:11 -05:00
James Cotton
d5c1e3578e AndroidGCS HID: Remove more locks to try and prevent HID deadlocking 2012-08-16 03:44:10 -05:00
James Cotton
f96b419a85 AndroidGCS: Add a toast message when connected (all objects downloaded) 2012-08-16 03:44:10 -05:00