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
201ee521d6
makefile: fall-back to android dx in the PATH
2012-10-10 01:10:53 -04:00
Stacey Sheldon
5314d9ad54
makefile: make android builds more quiet
2012-10-10 00:46:20 -04:00
Stacey Sheldon
f7467cbb47
makefile: generate multiple versions of UAVOs
...
This will allow a single GCS to have access to multiple
sets of UAVO libraries.
2012-10-10 00:35:14 -04:00
Stacey Sheldon
6da6274543
version-info: add subst for text version of UAVO sha1sum
2012-10-10 00:35:13 -04:00
Stacey Sheldon
4f53a88c35
makefile: remove debug cruft
2012-10-05 21:00:17 -04:00
Stacey Sheldon
45676f9355
androidgcs: add ignores for command-line android builds
...
Unfortunately, the android command-line tools insist on
putting a few files under the source tree. Ideally, these
files would go into ./build/androidgcs somewhere.
Tell git to ignore them until someone figures out how to
force them into the right place.
2012-10-05 20:54:01 -04: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
bc2080fec7
makefile: add function for computing relative paths
2012-10-05 20:54:00 -04:00
Stacey Sheldon
40251afd6e
makefile: add update target for android SDK
...
This installs the components required for actually building
a full APK.
2012-10-05 19:48:08 -04:00
Stacey Sheldon
4305cf942d
makefile: Add installer target for the android SDK
2012-10-05 19:48:08 -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
chris pember
919202875e
temp fix for the sizing of the hitlv2 page to stop the squashing
2012-10-05 19:35:25 +10:00
David Ankers
bcc39b7fad
Make options window taller, turn on OpenGL by default on the map, we
...
already use this for the QML PFD and no issues reported.
2012-10-05 18:47:00 +10:00
David Ankers
7e8aa7079c
Make uploader plugin board images looks nicer, spotted by Steve, fixed by
...
Steve.
2012-10-05 17:39:13 +10:00
David Ankers
d42f4089ed
Updated tab Icons from Steve, match the welcome screen icons
2012-10-05 15:26:45 +10:00
chris pember
a536f74722
temp fix for the sizing of the multi page that will allow folks on tiny screens to have a uavo browser if they want
2012-10-05 13:25:49 +10:00
David Ankers
aaea66a5d0
Fix splitter on Scopes screen
2012-10-05 11:18:16 +10:00
David Ankers
2573e84e76
Change Welcome screen icon by popular request
2012-10-05 10:18:29 +10:00
PT_Dreamer
29111b3529
GCS-Map fixes
...
Find place now works when the user presses enter
Find place goes to zoom level 12.
Don't go to UAV position on HW connect if "follow UAV" mode is not set
2012-10-04 12:32:30 +01:00
PT_Dreamer
ac8d399d8d
GCS-Fixes Flight data tab icon not being displayed
2012-10-04 12:15:20 +01:00
David Ankers
af7fffdab6
Add Gadgets to HiTL screen
2012-10-04 13:09:54 +10:00
David Ankers
6b2ac1cf39
Spelling on browser config, add size settings to options so things don't
...
get scrunched.
2012-10-04 12:52:36 +10:00
James Cotton
c8d9f89ea3
Default DIAG_TASK was on for PipX
2012-10-03 15:11:15 -05:00
Laura Sebesta
35f7b4903f
Several files still needed to have comments removed.
...
Missed merge in git. Retry.
2012-10-03 15:10:58 -05:00
PT_Dreamer
a1ebdc38fa
Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into next
2012-10-03 14:13:28 +01:00
PT_Dreamer
10f329c7ca
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-03 14:10:27 +01:00
Fredrik Arvidsson
4f84c4ba3b
Merge branch 'next' into thread/OP-39
2012-10-02 23:20:28 +02:00
Fredrik Arvidsson
a47687cff8
OP-39 Added correct dependencies to SetupWizard plugin specification.
...
Renamed FlashPage to FlashDance, eeh, no SavePage :)
Removed unnecessary dependency in setupwizard.pro
Fixed a bug with the Next button on the first page.
Fixed a bug with the cancel button on the last page.
2012-10-02 23:17:56 +02:00
James Cotton
897b07da02
Merge remote-tracking branch 'origin/kenz/diag_stack_split' into next
2012-10-02 14:20:08 -05:00
Fredrik Arvidsson
13f10949e8
OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines.
2012-10-01 21:50:00 +02:00
PT_Dreamer
8744e3dc93
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-01 13:42:59 +01:00
Fredrik Arvidsson
138848453f
OP-39 Changed the Radio Setup Wizard to go to the Arming Settings screen after the last step in the wizard. Changed the info text in a dialog.
2012-09-30 17:27:20 +02:00
Fredrik Arvidsson
eed564a3c4
OP-39 Adding label to indicate when leveling is done in a more clear way.
2012-09-30 14:41:58 +02:00
Fredrik Arvidsson
ede0c2ebf9
OP-39 Small adjustment.
2012-09-30 14:24:54 +02:00
Fredrik Arvidsson
949569fdec
OP-39 Added handling of switching to correct tab in input configuration section when starting Radio Setup Wizard.
2012-09-30 14:19:31 +02:00
Fredrik Arvidsson
3fa2d504bb
Merge branch 'next' into thread/OP-39
2012-09-30 13:37:24 +02:00
