Browse Source

Merge pull request #1786 from mavlink/dronelink

Remove reference to defunct droneos service
QGC4.4
Don Gagne 10 years ago
parent
commit
7a8d574ee3
  1. 4
      src/ui/MAVLinkSettingsWidget.cc
  2. 6
      src/ui/MAVLinkSettingsWidget.ui

4
src/ui/MAVLinkSettingsWidget.cc

@ -48,7 +48,7 @@ MAVLinkSettingsWidget::MAVLinkSettingsWidget(MAVLinkProtocol* protocol, QWidget @@ -48,7 +48,7 @@ MAVLinkSettingsWidget::MAVLinkSettingsWidget(MAVLinkProtocol* protocol, QWidget
// AUTH
m_ui->droneOSCheckBox->setChecked(protocol->getAuthEnabled());
QSettings settings;
m_ui->droneOSComboBox->setCurrentIndex(m_ui->droneOSComboBox->findText(settings.value("DRONEOS_HOST", "droneos.com:14555").toString()));
m_ui->droneOSComboBox->setCurrentIndex(m_ui->droneOSComboBox->findText(settings.value("DRONELINK_HOST", "dronelink.io:14555").toString()));
m_ui->droneOSLineEdit->setText(protocol->getAuthKey());
// Initialize state
@ -169,7 +169,7 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable) @@ -169,7 +169,7 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable)
// Set key
protocol->setAuthKey(m_ui->droneOSLineEdit->text().trimmed());
QSettings settings;
settings.setValue("DRONEOS_HOST", m_ui->droneOSComboBox->currentText());
settings.setValue("DRONELINK_HOST", m_ui->droneOSComboBox->currentText());
}
protocol->enableAuth(enable);
}

6
src/ui/MAVLinkSettingsWidget.ui

@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
</property>
<item>
<property name="text">
<string>mavlink.droneos.com:14555</string>
<string>dronelink.io:14555</string>
</property>
</item>
<item>
@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
<item row="15" column="0" colspan="3">
<widget class="QCheckBox" name="droneOSCheckBox">
<property name="text">
<string>Forward MAVLink packets of all links to http://droneos.com</string>
<string>Forward MAVLink packets of all links to the host below</string>
</property>
</widget>
</item>
@ -280,7 +280,7 @@ @@ -280,7 +280,7 @@
<item row="16" column="1" colspan="2">
<widget class="QLineEdit" name="droneOSLineEdit">
<property name="text">
<string>Enter your DroneOS API Token/Key</string>
<string>Enter your authentication token</string>
</property>
<property name="maxLength">
<number>32</number>

Loading…
Cancel
Save