rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Code Issues Releases Activity
7,778 Commits 5 Branches 8 Tags 266 MiB
333d0fe8c9
Commit Graph

399 Commits

Author SHA1 Message Date
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
James Cotton
53d4d8b507 AndroidGCS HID: Use the dettached message to shut down HID telemetry properly 2012-08-16 03:44:10 -05:00
James Cotton
5e163861a4 AndroidGCS HID: Go back to a read and write thread but now use synchronous 
bultTransfer for write which gets rid of the segfaults with running two
asynchronous transfers.
 2012-08-16 03:44:10 -05:00
James Cotton
785cda8052 AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing 
elements twice.
 2012-08-16 03:43:29 -05:00
James Cotton
335ccc54a3 AndroidGCS Controller: Make sure to remove the callback on manual control 
settings before updating it.
 2012-08-16 03:43:28 -05:00
James Cotton
75ce520503 Make sure the USB scheduling is thread safe. 2012-08-16 03:43:28 -05:00
James Cotton
69fbefee85 HID: Since there is only one usb device connection queue read and write events 
onto that single connection and wait for either.
 2012-08-16 03:43:28 -05:00
James Cotton
6b4a14fa87 Remove legacy code for supporting two USB interfaces 2012-08-16 03:43:28 -05:00
James Cotton
050ec8096b HID: move all the variables to the top 2012-08-16 03:43:28 -05:00
James Cotton
f8ba049d56 AndroidGCS: In the telemetry class use a thread safe queue for transations and 
removed the synhronized blocks to prevent deadlocks.
 2012-08-16 03:43:28 -05:00
James Cotton
405c5a60f0 AndroidGCS: Cleanup of the HID telemetry code 2012-08-16 03:43:27 -05:00
James Cotton
3d34a5d280 AndrodGCS: Correctly check HID packet format 2012-08-16 03:43:27 -05:00
James Cotton
5fa36ddd5c AndroidGCS: Make sure not to try and get interface to expired telemetry 2012-08-16 03:43:27 -05:00
James Cotton
90779506be AndroidGCS: Refactor TCP and HID onto a common TelemTask class which handles 
most of the logic of setting up the UAVTalk, ObjectMangager, Telemetry and
TelemetryMonitor classes.  Provides a cleaner shutdown too.
 2012-08-16 03:43:10 -05:00
James Cotton
4eb846ba93 AndroidGCS: Get HID working properly for PipX 2012-08-16 03:43:10 -05:00
James Cotton
dc90210cfa AndroidGCS: Add support for HID to AndroidGCS 2012-08-16 03:43:10 -05:00
James Cotton
8a5819379a AndroidGCS Telemetry: Fix the determination of whether a transaction is pending 2012-08-15 02:02:05 -05:00
James Cotton
7f028f6d42 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-15 01:21:16 -05:00
James Cotton
1bbfb35446 AndroidGCS: Handler based telemetry. Now reschedule transactions if one is 
pending.
 2012-08-15 00:01:14 -05:00
James Cotton
653702ac23 AndroidGCS Telemetry: Finish moving telemetry into a runnable. 2012-08-13 23:47:37 -05:00
James Cotton
2d7bb4d3bb AndroidGCS: Start moving the telemetry object queue to a handler and a looper 2012-08-13 15:02:15 -05:00
James Cotton
2f65952952 AndroidGCS HID: Remove more locks to try and prevent HID deadlocking 2012-08-13 02:00:54 -05:00
James Cotton
aa9894c481 AndroidGCS: Add a toast message when connected (all objects downloaded) 2012-08-13 01:37:15 -05:00
James Cotton
3ea9ecd53b AndroidGCS HID: Use the dettached message to shut down HID telemetry properly 2012-08-13 01:25:08 -05:00
James Cotton
daab45d14d AndroidGCS HID: Go back to a read and write thread but now use synchronous 
bultTransfer for write which gets rid of the segfaults with running two
asynchronous transfers.
 2012-08-13 01:07:09 -05:00
James Cotton
f012248fd1 Updated android objects from merge 2012-08-13 00:09:10 -05:00
James Cotton
ef581342ac AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing 
elements twice.
 2012-08-13 00:08:14 -05:00
James Cotton
d77912e4b0 AndroidGCS Controller: Make sure to remove the callback on manual control 
settings before updating it.
 2012-08-13 00:08:08 -05:00
James Cotton
ae56dc74c2 Make sure the USB scheduling is thread safe. 2012-08-12 14:12:35 -05:00
James Cotton
02a1c94545 HID: Since there is only one usb device connection queue read and write events 
onto that single connection and wait for either.
 2012-08-12 14:00:50 -05:00
James Cotton
badbadef2f Remove legacy code for supporting two USB interfaces 2012-08-12 13:41:15 -05:00
James Cotton
a0ca56a071 HID: move all the variables to the top 2012-08-12 13:28:38 -05:00
James Cotton
b19a0947fb AndroidGCS: In the telemetry class use a thread safe queue for transations and 
removed the synhronized blocks to prevent deadlocks.
 2012-08-12 13:23:51 -05:00
James Cotton
e3ab372516 AndroidGCS: Cleanup of the HID telemetry code 2012-08-12 13:23:51 -05:00
James Cotton
75c7c167f0 AndrodGCS: Correctly check HID packet format 2012-08-12 00:32:09 -05:00
James Cotton
4199562534 AndroidGCS: Make sure not to try and get interface to expired telemetry 2012-08-12 00:32:09 -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
d0bb6c3813 AndroidGCS: Refactor TCP and HID onto a common TelemTask class which handles 
most of the logic of setting up the UAVTalk, ObjectMangager, Telemetry and
TelemetryMonitor classes.  Provides a cleaner shutdown too.
 2012-08-11 14:49:35 -05:00
James Cotton
5addc15f60 AndroidGCS: Get HID working properly for PipX 2012-08-11 02:29:26 -05:00
James Cotton
de2f6a64e2 AndroidGCS: Add support for HID to AndroidGCS 2012-08-10 23:19:47 -05:00
James Cotton
cab661e94b AndroidGCS: Update the controller gadget to the newer style updates 2012-08-10 16:16:39 -05:00
James Cotton
9985910969 AndroidGCS TelemetryMonitor: Now that transactions are working more reliably we 
can emit the connected signal at the end of fetching all the objects.
 2012-08-10 16:11:20 -05:00
James Cotton
38117f6e69 AndroidGCS Telemetry: Telemetry no longer enqueues identical object 
transactions multiple times so only the most recent will occur.  Since it
doesn't enqueue the data the end behavior to the UAV should be identical.

Also renamed processObjectUpdates to enqueueObjectUpdates to make it more
intuitive.
 2012-08-10 15:58:52 -05:00
James Cotton
1d361a53cd AndroidGCS Telemetry: Make sure when telemetry changes settings it removes it's 
listeners before adding more
 2012-08-10 15:27:43 -05:00
James Cotton
de26c3297e AndroidGCS Telemetry: Get rid of a tier of redirection through annoymous 
classes that was legacy from the GCS port.
 2012-08-10 15:22:56 -05:00
James Cotton
6ebf4fe87c AndroidGCS UAVTalk: Pretty thorough clean up focused on how transactions are 
handled at the UAVTalk level where there can only be one pending transaction on
the wire.
 2012-08-10 14:18:41 -05:00
James Cotton
6b9b49734e Check there is an active telemetry before trying to disconnect it 2012-08-10 10:21:28 -05:00
James Cotton
1bc8553658 Small typo in telemetry merge. 2012-08-10 10:20:45 -05:00
James Cotton
82637ff8ab Now the callbacks disconnect system alarms shouldn't need to check the fields 
are not null
 2012-08-10 10:20:21 -05:00
James Cotton
d14ad1c354 Check in some missing artwork 2012-08-10 10:15:32 -05:00
James Cotton
d429cc200c Merge branch 'sim_android_telemetry' into sim_android 
Conflicts:
	androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
 2012-08-10 10:12:48 -05:00
James Cotton
a8fa1c6b0d Merge branch 'android' into sim_android 2012-08-10 10:10:47 -05:00
James Cotton
29d5365f0a AndroidGCS: More refactoring of ObjectManagerActivity. Now the updates are 
disconnected on pause and reestabilished on resume.  This only happens within
an onConnected/onDisconnected life cycle.
 2012-08-10 10:04:22 -05:00
James Cotton
176922f41c AndroidGCS: Also make the map disconnect its listeners. 2012-08-10 10:04:17 -05:00
James Cotton
749d695f4d AndroidGCS: ObjectManagerActivity maintains a list of objects it is getting 
updates from and disconnects them on onStop().  This should probably move to
onPause / onResume
 2012-08-10 10:04:11 -05:00
James Cotton
4bcb5437cd AndroidGCS: More refactoring of ObjectManagerActivity. Now the updates are 
disconnected on pause and reestabilished on resume.  This only happens within
an onConnected/onDisconnected life cycle.
 2012-08-10 09:48:10 -05:00
James Cotton
4594a59155 AndroidGCS: Also make the map disconnect its listeners. 2012-08-10 08:53:29 -05:00
James Cotton
56dfa62682 AndroidGCS: ObjectManagerActivity maintains a list of objects it is getting 
updates from and disconnects them on onStop().  This should probably move to
onPause / onResume
 2012-08-10 08:49:40 -05:00
James Cotton
1b8db4eeec AndroidGCS: When priority transmit queue is full this is not a reason to crash. 2012-08-10 02:18:30 -05:00
James Cotton
4bcac07c8c AndroidGCS: Because right now the object updated callbacks are not diconnected 
when an activity goes away we need to check the view is valid when processing
the object callbacks.
 2012-08-10 02:17:13 -05:00
James Cotton
92209f8e42 AndroidGCS bugfix: Missed a break in a case statement. 2012-08-10 02:17:13 -05:00
James Cotton
5eabb1777d AndroidGCS: Whitespace fixing for TelemetryMonitor 2012-08-10 02:17:12 -05:00
James Cotton
78469aa6a4 AndroidGCS: Use a WeakReference to stop the OPTelemetryService handle leaking. 2012-08-10 02:17:12 -05:00
James Cotton
37c4880fba AndroidGCS: Unregister the activity broadcast receiver onStop(). Create it 
onStart() instead.
 2012-08-10 02:15:38 -05:00