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
PT_Dreamer
821f954276
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-08 23:32:07 +01:00
Mike LaBranche
0f35e5f776
Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release
2012-08-08 15:05:57 -07: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
7cca5696a2
Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next
2012-08-08 14:11:24 -05:00
Laura Sebesta
fe6ea7e0e2
Fixed getUAVPosition to use position actual data correctly.
...
Refactored coordinate conversion names in order to be clearer, since
two identically named functions-- one in revo, one here-- performed
very different maths.
2012-08-08 20:58:13 +02:00
Kenz Dale
f3e1e768ad
Refactored variable names to be more helpful.
2012-08-08 20:57:41 +02:00
Kenz Dale
6b3cb29ea1
Fixed maximum size for title bar in map widget.
2012-08-08 20:56:29 +02:00
James Cotton
06a6e367b0
Merge remote-tracking branch 'origin/hyper/OP-661' into next
2012-08-08 13:49:48 -05:00
Chris Pember
ee217ad17e
fixed aircraft page, with different layout
2012-08-07 20:53:02 -07:00
Chris Pember
0d079f2059
fixed aircraft page, were some minor adjustments I wanted to make
2012-08-07 14:29:16 -07:00
PT_Dreamer
74cd57e8a0
GCS - IFDEFed everything pathplanner related.
2012-08-07 22:03:40 +01:00
Chris Pember
820162fa27
fixed aircraft page, specifically multirotor page so it works better
2012-08-07 13:53:13 -07:00
Chris Pember
36707aef67
fixed save area in all forms, shrunk down the output form upper groupbox a bit
2012-08-07 11:33:21 -07:00
Chris Pember
3fb6e35b7f
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-07 10:48:13 -07:00
PT_Dreamer
9dca82a6db
GCS-Created new stylesheet rule for the config plugin list
...
Reverted increase of list width.
2012-08-07 12:25:04 +01:00
Chris Pember
f75d710bcd
fixed save area in camerastab ui form to make skinny
2012-08-06 20:07:50 -07:00
PT_Dreamer
fc32ec8d8f
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-06 22:55:57 +01:00
PT_Dreamer
2963fd2658
GCS - Increased tabbed widget width on the config page.
2012-08-06 22:55:35 +01:00
James Cotton
7a214dc6cb
AndroidGCS: Clean up some warnings in UAVO templates
2012-08-06 16:55:00 -05:00
James Cotton
a067c0b0de
AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long
...
values instead of ints.
2012-08-06 16:54:57 -05:00
James Cotton
fc7e9d2b2b
AndroidGCS: Change the UAVO generation to suppress warnings
2012-08-06 16:54:57 -05:00
James Cotton
ae40f88600
AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to
...
be unsigned uint32 which is unsupported by java.
2012-08-06 16:54:57 -05:00
James Cotton
9960411ead
Finish porting the meta data changes from GCS and update all the UAVOs
2012-08-06 16:54:55 -05:00
James Cotton
f338625092
Removed various debugging outputs and exceptions for now (will add back in a
...
more principled manner later). Also updated the auto generated code.
2012-08-06 16:54:19 -05:00
James Cotton
9a4c158690
Java autogenerated code to be more compatible with gcs code
2012-08-06 16:54:18 -05:00
James Cotton
f0e4c10cfa
Continuing to work on the java code to be more consistent with GCS code
2012-08-06 16:54:17 -05:00
James Cotton
1810fb61a0
Update the object template to be more consistent with ground code
2012-08-06 16:54:17 -05:00
PT_Dreamer
40415f606e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-06 19:01:48 +01:00
Chris Pember
89a8b05422
fixed tab order, a little spacing tweak onadvanced page
2012-08-06 10:32:01 -07:00
James Cotton
f6692c07fe
AndroidGCS: Clean up some warnings in UAVO templates
2012-08-06 01:17:19 -05:00
Chris Pember
c600014f2f
merged the weak leveling and axis lock to same group
2012-08-05 14:04:42 -07:00
Chris Pember
bcb23bb779
pre-spinner value align shift
2012-08-05 12:44:36 -07:00
Chris Pember
56dfed2e8b
pre-spinner value align shift
2012-08-05 12:41:19 -07:00
Laura Sebesta
d7b123f836
Remove OSG from Mac compile of GCS.
2012-08-05 20:36:00 +02:00
James Cotton
cd6a2fb7da
AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long
...
values instead of ints.
2012-08-05 04:41:57 -05:00
James Cotton
35d57911f9
AndroidGCS: Change the UAVO generation to suppress warnings
2012-08-05 04:11:33 -05:00
James Cotton
33132e8ebd
AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to
...
be unsigned uint32 which is unsupported by java.
2012-08-05 04:09:05 -05:00
Chris Pember
17bcdb6113
resized the default buttons areas, moved the entire sensor tuning to expert, fixed apply layout spacing
2012-08-04 23:03:56 -07:00
Chris Pember
72749a1ce1
resized the default buttons areas, moved the entire sensor tuning to expert, still WIP
2012-08-04 23:03:00 -07:00
James Cotton
d201cad768
Connect correct signal to relay tuning so the UI populates the calculated
...
stabilization settings.
2012-08-04 12:03:53 -05:00
Chris Pember
0d2e307885
resized the save area on stabi page, added axislock and weakleveling to advanced menu
2012-08-03 22:01:54 -07:00
Mike LaBranche
0643f59b85
Merge branch 'pt/CC3d_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
2012-08-03 14:36:16 -07:00
Mike LaBranche
38e521fc1a
TelemetryWidget: set AlignCenter, chasing osx render correctness.
2012-08-03 13:52:35 -07:00
PT_Dreamer
df61d33f66
GCS- Added the ability to have more than 1 ui limit per index
2012-08-03 18:57:24 +01:00
PT_Dreamer
d043d53a3d
Merge branch 'pt/boardbased_ui_limits' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
2012-08-03 18:16:50 +01:00
PT_Dreamer
4d19062059
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
2012-08-03 18:14:51 +01:00
Fredrik Arvidsson
3bc1fbd8f1
Merge branch 'next' into thread/OP-39
2012-08-03 18:33:39 +02:00