James Cotton
f94f187528
AndroidGCS: Remove an unnecessary check that was triggering false positive telemetry errors
2012-10-14 19:54:44 -05:00
James Cotton
d975a65f65
AndroidGCS: Delete any existing jars before loading to make sure behavior is consistent
2012-10-14 19:54:38 -05:00
James Cotton
7eac1e2245
AndroidGCS Telemetry: Use more finely grained semaphores to fix a deadlock
...
between UAVTalk and Telemetry.
1. processInputStream -> updateObjReq (locks uavtalk) -> tranactionCompleted (locks transInfo)
2. transactionTimeout (locks transInfo) -> sendObjectRequest -> ? -> setupTransaction (locks uavtalk)
2012-10-14 16:03:23 -05:00
James Cotton
c142deaa9d
When the UAVO collection is missing, list which are available.
2012-10-14 14:34:11 -05:00
James Cotton
16adf27082
AndroidGCS: Make the telemetry monitor deal with loading the UAVO set before
...
starting to retrieve all the objects.
2012-10-14 14:33:27 -05:00
James Cotton
11dbdf3a52
AndroidGCS: Only use a 16 character name for UAVOs. Was breaking before on hardware.
2012-10-11 12:38:16 -05:00
James Cotton
0d42df9a02
AndroidGCS: Add a message when the UAVOs are loaded
2012-10-10 08:22:41 -05:00
James Cotton
fcaced59b5
AndroidGCS: Entire hash is now used to locate objects and they are pulled from
...
assets/uavos
2012-10-10 08:16:57 -05:00
James Cotton
557904fec9
AndroidGCS: Check in a uavobjects.jar into the assets directory and use that now
...
The previous hoops are still required to create that file.
Conflicts:
androidgcs/assets/uavobjects.jar
2012-10-10 00:48:25 -05:00
James Cotton
80197f830c
AndroidGCS: Remove the unit tests since they break the dynamic loading of UAVObjects
2012-10-10 00:29:22 -05:00
James Cotton
df6d7eb11d
AndroidGCS: Make the tablet load the appropriate UAVO file based on the description
...
from the assets.
Rename the uavobjects.jar to match the uavo hash.
Conflicts:
androidgcs/assets/875bbaadee717b2f.jar
2012-10-10 00:23:54 -05:00
James Cotton
76785cad57
AndroidGCS: Dynamic loading works. Currently won't work out of the box though.
...
From the build/uavobjects-synth/java:
1. mkdir -p src/org/openpilot/uavtalk/uavobjects
2. javac *.java ../../../androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java \
../../../androidgcs/src/org/openpilot/uavtalk/UAVObject*.java \
../../../androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java \
-d .
3. rm org/openpilot/uavtalk/*.class
4. jar cf tmp_org.openpilot.uavtalk.uavobjects.jar org
5. dx --dex --output org.openpilot.uavtalk.uavobjects.jar tmp_org.openpilot.uavtalk.uavobjects.jar
6. adb push org.openpilot.uavtalk.uavobjects.jar /data/org.openpilot.uavtalk.uavobjects.jar
2012-10-10 00:22:54 -05:00
James Cotton
c6341139c2
AndroidGCS: Dynamically load /data/uavobjects.jar for the objects
2012-10-10 00:22:45 -05:00
James Cotton
1a1aa85d1a
AndroidGCS: Remove the old fake telemetry
2012-10-10 00:22:21 -05:00
James Cotton
11079a6dd7
AndroidGCS: Restore stripped down UAVObjectsInitialize which only registers
...
FlightTelementryStats GCSTelemetryStats and FirmwareIAPObj
2012-10-10 00:22:00 -05:00
James Cotton
51868437c6
Drop the old UAVObjects directory
2012-10-10 00:21:51 -05:00
James Cotton
4d0490dde9
Androidgcs: Symlink build/androidgcs/assets/uavo to the androidgcs directory to keep eclipse happy
2012-10-10 00:18:46 -05:00
Stacey Sheldon
5ffe555bae
androidgcs: use symlink to autogenerated uavo java code
2012-10-05 20:54:01 -04:00
Stacey Sheldon
45fe7193af
androidgcs: remove pre-built uavo code
...
The UAVO java code will be autogenerated.
2012-10-05 20:54:01 -04:00
Stacey Sheldon
6b4f60b263
makefile: add support for building androidgcs
2012-10-05 20:54:01 -04:00
Stacey Sheldon
94134b82f7
androidgcs: remove unicode chars to eliminate warnings
2012-10-05 19:48:08 -04:00
Stacey Sheldon
b0b1d9b681
androidgcs: dropped dependency on JUnit
...
Can't figure out how to get the build to find JUnit.
2012-10-05 19:48:08 -04:00
James Cotton
55a0f91da4
Update android objects
2012-09-12 02:36:33 -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
6d16f4c0a9
AndroidGCS Map: Make sure to grab the correct uavLocation and homeLocation at startup
2012-08-30 12:14:03 -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
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
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
