James Cotton
c0b9d9015d
Hack: The OSX sim includes modules slightly differently than the
...
main code so needs an implementation of FirmwareIAPStart() until
this is fixed.
2012-10-10 08:29:30 -05:00
James Cotton
715fb65df7
OSX Simulation: Start populating the board and fw information
...
This will allow testing the tablet to know what type of UAVOs to
expect.
Conflicts:
flight/Revolution/Makefile.osx
2012-10-10 08:29:20 -05: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
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
James Cotton
aad1c3bd32
FreeRTOS: Make F1 targets use the FreeRTOS common code from PiOS/Common
2012-10-09 10:08:06 -05:00
James Cotton
17f3c4d4e0
Re-add our code for accessing the run time information in freertos.
2012-10-09 09:57:57 -05:00
James Cotton
72c84fc49c
Upgrade to FreeRTOS 7.2.0
2012-10-09 09:48:02 -05:00
James Cotton
4b35cdf0ef
OSX Simulation: Start populating the board and fw information
...
This will allow testing the tablet to know what type of UAVOs to
expect.
2012-10-07 13:53:19 -05: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
James Cotton
8a2f6f7398
Package revomini
2012-10-05 11:43:22 -05:00
James Cotton
4284701b35
Update android objects
2012-10-05 08:48:12 -05:00
James Cotton
dae9cbc76d
Merge branch 'android' into revo
2012-10-05 08:47:20 -05:00
James Cotton
2191befe17
Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-05 08:20:35 -05: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
Brian Webb
9ea572f4f7
RFM22B: Fixed the signedness of the return value of the RSSI function.
2012-10-04 21:23:44 -07:00
Brian Webb
5724fa083c
RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before.
2012-10-04 21:11:40 -07: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
James Cotton
82efb91fad
Add developer GCS config layout
2012-10-04 20:44:00 -05: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
James Cotton
193fdcd9a2
Make the default PipX RF power 1.25 mW to avoid damanging anything when there is no antenna
2012-10-04 16:41:02 -05:00
Brian Webb
2541affd80
RFM22B: Added back configuration of the RF Power and RF Datarate. Also added setting of the destination ID in the rfm22b driver.
2012-10-04 16:39:07 -05:00
James Cotton
99a0eeae3d
Merge commit 'e89ae3389d95603fccdcda535ab6cbed97099851' into revo
2012-10-04 16:38:26 -05:00
James Cotton
13cabd2ea4
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-04 16:38:08 -05:00