rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release

Browse Source
This commit is contained in:
PT_Dreamer 2012-08-09 22:42:35 +01:00
commit 3df35b933c
9 changed files with 84 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
View File

@ -3,13 +3,25 @@
<AutoConnect>true</AutoConnect>
<AutoSelect>true</AutoSelect>
<ExpertMode>false</ExpertMode>
<OverrideLanguage>en_AU</OverrideLanguage>
<LastPreferenceCategory>Notify Plugin</LastPreferenceCategory>
<LastPreferencePage>settings</LastPreferencePage>
<SaveSettingsOnExit>true</SaveSettingsOnExit>
<SettingsWindowHeight>600</SettingsWindowHeight>
<SettingsWindowWidth>800</SettingsWindowWidth>
<UDPMirror>false</UDPMirror>
<Description>Wide configuration</Description>
<Details>Default configuration built for wide screens (17"up)</Details>
<StyleSheet>wide</StyleSheet>
</General>
<IPconnection>
<Current>
<arr_1>
<Port>1</Port>
<UseTCP>0</UseTCP>
</arr_1>
<size>1</size>
</Current>
</IPconnection>
<KeyBindings>
<size>0</size>
</KeyBindings>
@ -27,6 +39,58 @@
<Mode6>86</Mode6>
<Welcome>100</Welcome>
</ModePriorities>
<Plugins>
<SoundNotifyPlugin>
<configInfo>
<locked>false</locked>
<version>1.0.0</version>
</configInfo>
<data>
<Current>
<arr_1>
<CurrentLanguage>default</CurrentLanguage>
<DataObject>FlightStatus</DataObject>
<ExpireTimeout>0</ExpireTimeout>
<Mute>false</Mute>
<ObjectField>Armed</ObjectField>
<RangeLimit>0</RangeLimit>
<Repeat>0</Repeat>
<SayOrder>0</SayOrder>
<Sound1>armed</Sound1>
<Sound2></Sound2>
<Sound3></Sound3>
<SoundCollectionPath>%%DATAPATH%%sounds</SoundCollectionPath>
<Value1>Armed</Value1>
<Value2>0</Value2>
</arr_1>
<size>1</size>
</Current>
<EnableSound>true</EnableSound>
<listNotifies>
<arr_1>
<CurrentLanguage>default</CurrentLanguage>
<DataObject>FlightStatus</DataObject>
<ExpireTimeout>15</ExpireTimeout>
<Mute>false</Mute>
<ObjectField>Armed</ObjectField>
<RangeLimit>0</RangeLimit>
<Repeat>0</Repeat>
<SayOrder>0</SayOrder>
<Sound1>armed</Sound1>
<Sound2></Sound2>
<Sound3></Sound3>
<SoundCollectionPath>%%DATAPATH%%sounds</SoundCollectionPath>
<Value1>Armed</Value1>
<Value2>0</Value2>
</arr_1>
<size>1</size>
</listNotifies>
</data>
</SoundNotifyPlugin>
</Plugins>
<SerialConnection>
<speed>57600</speed>
</SerialConnection>
<UAVGadgetConfigurations>
<ConfigGadget>
<default>
@ -1694,8 +1758,8 @@
<altitude>2000</altitude>
<cacheOnly>false</cacheOnly>
<earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
<latitude>46.671478</latitude>
<longitude>10.158932</longitude>
<latitude>46.6715</latitude>
<longitude>10.1589</longitude>
<qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
<terrainEnabled>false</terrainEnabled>
</data>
@ -1710,10 +1774,10 @@
<altitude>2000</altitude>
<cacheOnly>false</cacheOnly>
<earthFile>%%DATAPATH%%pfd/default/readymap.earth</earthFile>
<latitude>46.671478</latitude>
<longitude>10.158932</longitude>
<latitude>46.6715</latitude>
<longitude>10.1589</longitude>
<qmlFile>%%DATAPATH%%pfd/default/Pfd.qml</qmlFile>
<terrainEnabled>true</terrainEnabled>
<terrainEnabled>false</terrainEnabled>
</data>
</Terrain>
</PfdQmlGadget>
@ -1738,7 +1802,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -1784,7 +1847,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>20</dataSize>
<plotCurve0>
@ -1840,7 +1902,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -1886,7 +1947,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -1912,7 +1972,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>40</dataSize>
<plotCurve0>
@ -2008,7 +2067,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -2054,7 +2112,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -2100,7 +2157,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>60</dataSize>
<plotCurve0>
@ -2146,7 +2202,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>240</dataSize>
<plotCurve0>
@ -2282,7 +2337,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>20</dataSize>
<plotCurve0>
@ -2328,7 +2382,6 @@
<data>
<LoggingEnabled>false</LoggingEnabled>
<LoggingNewFileOnConnect>false</LoggingNewFileOnConnect>
<LoggingPath></LoggingPath>
<configurationStreamVersion>1000</configurationStreamVersion>
<dataSize>240</dataSize>
<plotCurve0>
@ -2343,9 +2396,6 @@
</plotCurve0>
<plotCurve1>
<color>0</color>
<mathFunction></mathFunction>
<uavField></uavField>
<uavObject></uavObject>
<yMaximum>0</yMaximum>
<yMeanSamples>1</yMeanSamples>
<yMinimum>0</yMinimum>

4
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
View File

@ -58,10 +58,10 @@ ConnectionManager::ConnectionManager(Internal::MainWindow *mainWindow, QTabWidge
QHBoxLayout *layout = new QHBoxLayout;
layout->setSpacing(5);
layout->setContentsMargins(5,5,5,5);
layout->setContentsMargins(5,2,5,2);
m_monitor = new TelemetryMonitorWidget(this);
layout->addWidget(m_monitor);
layout->addWidget(m_monitor, Qt::AlignHCenter);
layout->addWidget(new QLabel(tr("Connections:")));

2
ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
View File

@ -40,7 +40,7 @@ DialGadgetWidget::DialGadgetWidget(QWidget *parent) : QGraphicsView(parent)
setMinimumSize(64,64);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setScene(new QGraphicsScene(this));
setRenderHints(QPainter::Antialiasing);
setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
m_renderer = new QSvgRenderer();

2
ground/openpilotgcs/src/plugins/gcscontrol/joystickcontrol.cpp
View File

@ -40,7 +40,7 @@ JoystickControl::JoystickControl(QWidget *parent) : QGraphicsView(parent)
setMinimumSize(64, 64);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setScene(new QGraphicsScene(this));
setRenderHints(QPainter::Antialiasing);
setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
m_renderer = new QSvgRenderer();
bool test = m_renderer->load(QString(":/gcscontrol/images/joystick.svg"));

2
ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
View File

@ -36,7 +36,7 @@ LineardialGadgetWidget::LineardialGadgetWidget(QWidget *parent) : QGraphicsView(
setMinimumSize(32,32);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setScene(new QGraphicsScene(this));
setRenderHints(QPainter::Antialiasing);
setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
m_renderer = new QSvgRenderer();
verticalDial = false;

2
ground/openpilotgcs/src/plugins/magicwaypoint/positionfield.cpp
View File

@ -46,7 +46,7 @@ PositionField::PositionField(QWidget *parent) :
setMinimumSize(64,64);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setScene(new QGraphicsScene(this));
setRenderHints(QPainter::Antialiasing);
setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
m_renderer = new QSvgRenderer();
Q_ASSERT( m_renderer->load(QString(":/magicwaypoint/images/positionfield.svg")) != 0 );

8
ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
View File

@ -206,7 +206,9 @@ void SoundNotifyPlugin::connectNotifications()
if (!lstNotifiedUAVObjects.contains(obj)) {
lstNotifiedUAVObjects.append(obj);
connect(obj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(on_arrived_Notification(UAVObject*)));
connect(obj, SIGNAL(objectUpdated(UAVObject*)),
this, SLOT(on_arrived_Notification(UAVObject*)),
Qt::QueuedConnection);
}
} else {
qNotifyDebug() << "Error: Object is unknown (" << notify->getDataObject() << ").";
@ -297,8 +299,6 @@ void SoundNotifyPlugin::on_expiredTimer_Notification()
return;
notification->stopExpireTimer();
volatile QMutexLocker lock(&_mutex);
if (!_pendingNotifications.isEmpty()) {
qNotifyDebug() << QString("expireTimer: %1% | %2 | %3").arg(notification->getDataObject())
.arg(notification->getObjectField())
@ -327,7 +327,6 @@ void SoundNotifyPlugin::stateChanged(Phonon::State newstate, Phonon::State oldst
{
qNotifyDebug() << "New State: " << QVariant(newstate).toString();
volatile QMutexLocker lock(&_mutex);
// assignment to NULL needed to detect that palying is finished
// it's useful in repeat timer handler, where we can detect
// that notification has not overlap with itself
@ -442,7 +441,6 @@ void SoundNotifyPlugin::checkNotificationRule(NotificationItem* notification, UA
}
if(notification->retryValue() == NotificationItem::repeatOncePerUpdate && notification->getCurrentUpdatePlayed())
return;
volatile QMutexLocker lock(&_mutex);
if (!playNotification(notification)) {
if (!_pendingNotifications.contains(notification)

6
ground/openpilotgcs/src/plugins/notify/notifyplugin.h
View File

@ -74,7 +74,6 @@ private:
bool playNotification(NotificationItem* notification);
void checkNotificationRule(NotificationItem* notification, UAVObject* object);
void readConfig_0_0_0();
private slots:
@ -90,10 +89,6 @@ private slots:
private:
bool enableSound;
QList< QList<Phonon::MediaSource>* > lstMediaSource;
QStringList mediaSource;
QMultiMap<QString, PhononObject> mapMediaObjects;
QSettings* settings;
QList<UAVDataObject*> lstNotifiedUAVObjects;
QList<NotificationItem*> _notificationList;
@ -106,7 +101,6 @@ private:
PhononObject phonon;
NotifyPluginOptionsPage* mop;
TelemetryManager* telMngr;
QMutex _mutex;
};
#endif // SOUNDNOTIFYPLUGIN_H

6
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -75,7 +75,11 @@ plugin_modelview.depends = plugin_coreplugin
plugin_modelview.depends += plugin_uavobjects
SUBDIRS += plugin_modelview
!contains(QT_VERSION, ^4\\.8\\..*) {
#Qt 4.8.0 / phonon may crash on Mac, fixed in Qt 4.8.1, QTBUG-23128
macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin
!disable_notify_plugin {
#Notify gadget
plugin_notify.subdir = notify
plugin_notify.depends = plugin_coreplugin