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
James Cotton
57b91b7763
AndroidGCS: UAVTalk no longer extends Observable since there is only one
...
listener anyway we use a setListener pattern.
2012-08-10 02:15:37 -05:00
James Cotton
f13f977177
Fix: Revert change to ObjectBrowser
2012-08-10 02:15:37 -05:00
James Cotton
7a42c7b10e
AndroidGCS: Start supporting NAK and having uavTalk emit a transaction failed
...
and succeeded call. Had to change the mask on the AndroidGCS side to match the
FC side.
2012-08-10 02:15:37 -05:00
James Cotton
fcff84007e
Remove old OPTelemetryService
2012-08-10 02:14:44 -05:00
James Cotton
1c60d4b856
AndroidGCS: When priority transmit queue is full this is not a reason to crash.
2012-08-10 02:09:58 -05:00
James Cotton
7c6b81517e
AndroidGCS: Somehow multiple disconnects were triggered.
2012-08-10 02:09:32 -05:00
James Cotton
91a8186e54
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:01:27 -05:00
James Cotton
dec044d0fa
AndroidGCS bugfix: Missed a break in a case statement.
2012-08-10 02:00:55 -05:00
James Cotton
4313f1a3cc
AndroidGCS: Whitespace fixing for TelemetryMonitor
2012-08-10 01:12:20 -05:00
James Cotton
0100b2a085
AndroidGCS: Use a WeakReference to stop the OPTelemetryService handle leaking.
2012-08-10 01:12:20 -05:00
James Cotton
54e239d6cb
AndroidGCS: Unregister the activity broadcast receiver onStop(). Create it
...
onStart() instead.
2012-08-10 01:12:20 -05:00
James Cotton
d46a865229
AndroidGCS: UAVTalk no longer extends Observable since there is only one
...
listener anyway we use a setListener pattern.
2012-08-09 23:26:36 -05:00
James Cotton
3076a81347
Fix: Revert change to ObjectBrowser
2012-08-09 23:24:36 -05:00
James Cotton
5443dbb4ca
AndroidGCS: Start supporting NAK and having uavTalk emit a transaction failed
...
and succeeded call. Had to change the mask on the AndroidGCS side to match the
FC side.
2012-08-09 23:23:38 -05:00
James Cotton
c7abc42c5e
Remove unused TelemetryManager file
2012-08-08 22:58:00 -05:00
James Cotton
fcb3e8c152
AndroidGCS: Check in a FragmentTester class and add it to the home page.
...
Use it to the beginnings of the MapPosition fragment.
2012-08-08 19:15:03 -05:00
James Cotton
f530702ce9
Merge branch 'android' into sim_android
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/layout/pfd.xml
androidgcs/res/layout/system_alarms.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java
androidgcs/src/org/openpilot/androidgcs/CompassView.java
androidgcs/src/org/openpilot/androidgcs/Controller.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
androidgcs/src/org/openpilot/androidgcs/Logger.java
androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java
androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
androidgcs/src/org/openpilot/androidgcs/Preferences.java
androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java
androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java
androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java
androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.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/PositionActual.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
flight/Modules/GPS/GPS.c
2012-08-08 15:50:28 -05:00
James Cotton
1740bef847
AndroidGCS: Delete zip file of android icons
2012-08-08 14:25:52 -05:00
James Cotton
7cca5696a2
Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next
2012-08-08 14:11:24 -05:00
James Cotton
06a6e367b0
Merge remote-tracking branch 'origin/hyper/OP-661' into next
2012-08-08 13:49:48 -05:00
James Cotton
41a46258be
AndroidGCS: Change Sambas to not crash in AVD for bluetooth or if there are no
...
devices.
2012-08-08 13:43:09 -05:00
James Cotton
dd0a5b2cf2
AndroidGCS: Make home page buttons more vertical to work better on phones.
...
Maybe someone could make these automatically space out?
2012-08-08 13:17:30 -05:00
James Cotton
11a08c186c
AndroidGCS: Refactor the Fragments into their own package to keep the UI
...
"components" segregated. Is this good practice though? It means making a lot
of functions for the API between ObjectManagerActivity and Fragment public.
2012-08-08 13:14:38 -05:00
James Cotton
95dfc88f95
AndroidGCS: Move the PFD functionality into a fragment and then
...
programmatically instantiate that from the test PFD activity
2012-08-08 13:14:01 -05:00
James Cotton
ce52b4d199
AndroidGCS: Get telemetry service working again properly when in multiple
...
packages. Have to declare the full service name in AndroidManifest.xml which
seems not ideal.
2012-08-08 13:08:19 -05:00
James Cotton
ae36f39f1a
AndroidGCS: Show some less shitty graphics for PFD
2012-08-08 12:20:29 -05:00
James Cotton
2e554ebf8e
AndroidGCS: Move down some of the debugging output
2012-08-08 10:07:03 -05:00
James Cotton
ddb197a15d
AndroidGCS: Move the telemetry functionality into its own package
2012-08-08 10:04:52 -05:00
Stacey Sheldon
5902c19cc3
hid joystick: compress local usages since they're all in the same page
2012-08-08 10:38:43 -04:00
James Cotton
07074ef41e
AndroidGCS: Add copyright header of the other files
2012-08-08 09:22:09 -05:00
Stacey Sheldon
030d9e84f9
hid joystick: remove unnecessary usage page definitions
2012-08-08 10:15:08 -04:00
James Cotton
dc6b3af707
AndroidGCS: Add copyright headers to the UAVTalk/UAVObject/Telemetry implementations.
2012-08-08 09:06:31 -05:00
James Cotton
2008486922
AndroidGCS: Remove unused file
2012-08-08 09:00:31 -05:00
James Cotton
babe4d9f0e
AndroidGCS: Make the fragment object updated callbacks register in the main
...
activity method and use the main activity handler to consolidate things into
one place.
2012-08-08 08:55:58 -05:00