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

OP-1250 Add GPS protocol configuration (with minor corrections)

Browse Source
This commit is contained in:
Bertrand Oresve 2014-03-13 21:24:31 +01:00
parent 9622358149
commit bee59c58d3
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -82,9 +82,8 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
addWidgetBinding("HwSettings", "USB_VCPPort", m_telemetry->cbUsbVcp);
addWidgetBinding("HwSettings", "TelemetrySpeed", m_telemetry->telemetrySpeed);
addWidgetBinding("HwSettings", "GPSSpeed", m_telemetry->gpsSpeed);
/* OP-1250 : Add Gps protocol configuration to HwSettings --------------- */
// Add Gps protocol configuration
addWidgetBinding("GPSSettings", "DataProtocol", m_telemetry->gpsProtocol);
/* OP-1250 : ending ----------------------------------------------------- */
addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_telemetry->comUsbBridgeSpeed);
connect(m_telemetry->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp()));

17
ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp
View File

@ -65,10 +65,9 @@ ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(paren
addWidgetBinding("HwSettings", "GPSSpeed", m_ui->cbMainGPSSpeed);
addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_ui->cbMainComSpeed);
/* OP-1250 : Add Gps protocol configuration ---------------------------------- */
// Add Gps protocol configuration
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbMainGPSProtocol);
addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbFlexiGPSProtocol);
/* OP-1250 : ending ---------------------------------------------------------- */
connect(m_ui->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
@ -196,10 +195,9 @@ void ConfigRevoHWWidget::flexiPortChanged(int index)
m_ui->cbFlexiComSpeed->setVisible(false);
m_ui->lblFlexiSpeed->setVisible(true);
/* OP-1250 : Add Gps protocol configuration ---------------------------------- */
// Add Gps protocol configuration
m_ui->cbFlexiGPSProtocol->setVisible(false);
m_ui->lbFlexiGPSProtocol->setVisible(false);
/* OP-1250 : ending ---------------------------------------------------------- */
switch (m_ui->cbFlexi->currentIndex()) {
case HwSettings::RM_FLEXIPORT_TELEMETRY:
@ -209,10 +207,10 @@ void ConfigRevoHWWidget::flexiPortChanged(int index)
}
break;
case HwSettings::RM_FLEXIPORT_GPS:
/* OP-1250 : Add Gps protocol configuration ---------------------------------- */
// Add Gps protocol configuration
m_ui->cbFlexiGPSProtocol->setVisible(true);
m_ui->lbFlexiGPSProtocol->setVisible(true);
/* OP-1250 : ending ---------------------------------------------------------- */
m_ui->cbFlexiGPSSpeed->setVisible(true);
if (m_ui->cbMain->currentIndex() == HwSettings::RM_MAINPORT_GPS) {
m_ui->cbMain->setCurrentIndex(HwSettings::RM_MAINPORT_DISABLED);
@ -248,10 +246,9 @@ void ConfigRevoHWWidget::mainPortChanged(int index)
m_ui->cbMainComSpeed->setVisible(false);
m_ui->lblMainSpeed->setVisible(true);
/* OP-1250 : Add Gps protocol configuration ---------------------------------- */
// Add Gps protocol configuration
m_ui->cbMainGPSProtocol->setVisible(false);
m_ui->lbMainGPSProtocol->setVisible(false);
/* OP-1250 : ending ---------------------------------------------------------- */
switch (m_ui->cbMain->currentIndex()) {
case HwSettings::RM_MAINPORT_TELEMETRY:
@ -261,10 +258,10 @@ void ConfigRevoHWWidget::mainPortChanged(int index)
}
break;
case HwSettings::RM_MAINPORT_GPS:
/* OP-1250 : Add Gps protocol configuration ---------------------------------- */
// Add Gps protocol configuration
m_ui->cbMainGPSProtocol->setVisible(true);
m_ui->lbMainGPSProtocol->setVisible(true);
/* OP-1250 : ending ---------------------------------------------------------- */
m_ui->cbMainGPSSpeed->setVisible(true);
if (m_ui->cbFlexi->currentIndex() == HwSettings::RM_FLEXIPORT_GPS) {
m_ui->cbFlexi->setCurrentIndex(HwSettings::RM_FLEXIPORT_DISABLED);