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

LP-437 - GCS configuration support

Browse Source
This commit is contained in:
Alessio Morale 2016-10-29 20:56:25 +02:00
parent e39a5a92bc
commit 306c129480
6 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/gcs/src/plugins/config/configoplinkwidget.cpp
View File

@ -83,6 +83,7 @@ ConfigOPLinkWidget::ConfigOPLinkWidget(QWidget *parent) : ConfigTaskWidget(paren
addWidgetBinding("OPLinkSettings", "MainPort", m_oplink->MainPort);
addWidgetBinding("OPLinkSettings", "FlexiPort", m_oplink->FlexiPort);
addWidgetBinding("OPLinkSettings", "VCPPort", m_oplink->VCPPort);
addWidgetBinding("OPLinkSettings", "RadioAuxStream", m_oplink->RadioAuxPort);
addWidgetBinding("OPLinkSettings", "RFXtalCap", m_oplink->RFXtalCapValue);
addWidgetBinding("OPLinkSettings", "RFXtalCap", m_oplink->RFXtalCapSlider);

2
ground/gcs/src/plugins/config/configrevohwwidget.cpp
View File

@ -66,6 +66,8 @@ ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(paren
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbFlexiGPSProtocol);
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbRcvrGPSProtocol);
addWidgetBinding("HwSettings", "RadioAuxStream", m_ui->cbRadioAux);
setupCustomCombos();
}

13
ground/gcs/src/plugins/config/configrevohwwidget.ui
View File

@ -530,6 +530,19 @@
</property>
</widget>
</item>
<item row="12" column="2" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_">
<property name="text">
<string>Radio aux Stream</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QComboBox" name="cbRadioAux"/>
</item>
<item row="0" column="1" rowspan="12" colspan="4" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">

2
ground/gcs/src/plugins/config/configsparky2hwwidget.cpp
View File

@ -63,6 +63,8 @@ ConfigSparky2HWWidget::ConfigSparky2HWWidget(QWidget *parent) : ConfigTaskWidget
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbMainGPSProtocol);
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbFlexiGPSProtocol);
addWidgetBinding("HwSettings", "RadioAuxStream", m_ui->cbRadioAux);
setupCustomCombos();
}

15
ground/gcs/src/plugins/config/configsparky2hwwidget.ui
View File

@ -457,6 +457,21 @@
</property>
</widget>
</item>
<item row="0" column="2" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_">
<property name="text">
<string>Radio aux Stream</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="cbRadioAux"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_9">
<property name="text">

34
ground/gcs/src/plugins/config/oplink.ui
View File

@ -55,8 +55,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>947</width>
<height>575</height>
<width>926</width>
<height>647</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@ -672,6 +672,35 @@ Leave blank to use autogenerated Device ID.</string>
</property>
</widget>
</item>
<item row="5" column="6">
<widget class="QLabel" name="RadioAuxPortLabel">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Radio aux Port</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="7">
<widget class="QComboBox" name="RadioAuxPort">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Choose the function for the radio aux virtual com port.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -2200,6 +2229,7 @@ a frequency misalignement between the two modems.</string>
<tabstop>MainPort</tabstop>
<tabstop>FlexiPort</tabstop>
<tabstop>VCPPort</tabstop>
<tabstop>RadioAuxPort</tabstop>
<tabstop>RFXtalCapValue</tabstop>
<tabstop>applyButton</tabstop>
<tabstop>saveButton</tabstop>