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
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
PT_Dreamer
9379eb73d7
GCS-Fix stylesheet not being saved.
2012-08-10 03:03:52 +01:00
PT_Dreamer
254f98aad5
GCS-Updated configuration file with the latest changes
2012-08-09 22:47:48 +01:00
PT_Dreamer
3df35b933c
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-09 22:42:35 +01:00
PT_Dreamer
b0e6566114
GCS- Handle loading of the configuration file. Stylesheets files
...
are now loaded from mainwindow instead of main.
2012-08-09 22:33:13 +01:00
PT_Dreamer
dae15702ed
GCS-Delete previously used stylesheet and configuration files
2012-08-09 22:31:51 +01:00
PT_Dreamer
e2d7e824ed
GCS-Created new wide and default stylesheets and configurations just as an example.
...
Currently they are the same.
2012-08-09 22:30:31 +01:00
PT_Dreamer
9da1372e54
GCS-Change the way the stylesheets are copied (was not working for me)
...
Also copy the default configuration xml files. These are now on
the shared folder together with the stylesheet instead of being
inside a resource file.
Stylesheets and configuration files are now copied from SRC/SHARED to
APP/SHARED
2012-08-09 22:25:34 +01:00
PT_Dreamer
e033004656
GCS-Added new dialog to let the user choose from a list of available
...
configurations uppon startup when no valid configuration is found
2012-08-09 22:22:09 +01:00
Dmytro Poplavskiy
93dd153fc4
Enabled text antialiasing for a number of widgets
...
Unlike QPainter::setRenderHints(),
QGraphicsView::setRenderHints() set the render hints to flags passed as parameter,
so QPainter::TextAntialiasing flag is cleared.
changint it to setRenderHint or adding QPainter::TextAntialiasing
value fixes the AA text rendering.
2012-08-09 22:04:40 +10:00
David Ankers
5bf98a03c7
Align the new telem to the center, it's bugging me.
2012-08-09 18:12:56 +10:00
David Ankers
92a9a57bf7
Make options Window a better size, fixes a load of the cramped layout.
2012-08-09 15:42:00 +10:00
David Ankers
40e25ff8e2
Turn on sounds by default
2012-08-09 14:58:07 +10: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
Dmytro Poplavskiy
518358c8f7
Re-enabled the notify plugin with Qt 4.8
...
On all the platform except of Qt 4.8.0 on Mac,
this combination crashes.
Fixed in Qt 4.8.1, QTBUG-23128
2012-08-09 09:06:14 +10:00
Dmytro Poplavskiy
d358591726
Fixed possible notification plugin deadlock
...
Protecting with mutex stateChanged(Phonon::State)
and starting/stopping playback looks dangerous,
the media player may emit another state change leading to deadlock.
The mutex should not be necessary here
since all the slots are executed in the main thread.
Changing the objectUpdated(UAVObject*) connection type
to Qt::QueuedConnection is not strictly necessary,
signals between threads are queued by default,
it serves more the documentation purpose.
2012-08-09 09:05:59 +10:00
Dmytro Poplavskiy
f4ff84d41a
Notify plugin cleanup
...
Removed a few unused SoundNotifyPlugin members
2012-08-09 09:05:39 +10:00
