Commit 760ac1c1 authored by Don Gagne's avatar Don Gagne

Change 3DR Radio -> SiK Radio

3DR Radios no longer exist
parent 2fd104fa
...@@ -42,7 +42,7 @@ QGCView { ...@@ -42,7 +42,7 @@ QGCView {
readonly property string title: "FIRMWARE" readonly property string title: "FIRMWARE"
readonly property string highlightPrefix: "<font color=\"" + qgcPal.warningText + "\">" readonly property string highlightPrefix: "<font color=\"" + qgcPal.warningText + "\">"
readonly property string highlightSuffix: "</font>" readonly property string highlightSuffix: "</font>"
readonly property string welcomeText: "QGroundControl can upgrade the firmware on Pixhawk devices, 3DR Radios and PX4 Flow Smart Cameras." readonly property string welcomeText: "QGroundControl can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras."
readonly property string plugInText: "<big>" + highlightPrefix + "Plug in your device" + highlightSuffix + " via USB to " + highlightPrefix + "start" + highlightSuffix + " firmware upgrade.</big>" readonly property string plugInText: "<big>" + highlightPrefix + "Plug in your device" + highlightSuffix + " via USB to " + highlightPrefix + "start" + highlightSuffix + " firmware upgrade.</big>"
readonly property string flashFailText: "If upgrade failed, make sure to connect " + highlightPrefix + "directly" + highlightSuffix + " to a powered USB port on your computer, not through a USB hub. " + readonly property string flashFailText: "If upgrade failed, make sure to connect " + highlightPrefix + "directly" + highlightSuffix + " to a powered USB port on your computer, not through a USB hub. " +
"Also make sure you are only powered via USB " + highlightPrefix + "not battery" + highlightSuffix + "." "Also make sure you are only powered via USB " + highlightPrefix + "not battery" + highlightSuffix + "."
......
...@@ -148,7 +148,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort ...@@ -148,7 +148,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort
_startFlashWhenBootloaderFound = false; _startFlashWhenBootloaderFound = false;
break; break;
case QGCSerialPortInfo::BoardType3drRadio: case QGCSerialPortInfo::BoardType3drRadio:
_foundBoardTypeName = "3DR Radio"; _foundBoardTypeName = "SiK Radio";
if (!firstAttempt) { if (!firstAttempt) {
// Radio always flashes latest firmware, so we can start right away without // Radio always flashes latest firmware, so we can start right away without
// any further user input. // any further user input.
......
...@@ -534,7 +534,7 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -534,7 +534,7 @@ void LinkManager::_updateAutoConnectLinks(void)
break; break;
case QGCSerialPortInfo::BoardType3drRadio: case QGCSerialPortInfo::BoardType3drRadio:
if (_autoconnect3DRRadio) { if (_autoconnect3DRRadio) {
pSerialConfig = new SerialConfiguration(QString("3DR Radio on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(QString("SiK Radio on %1").arg(portInfo.portName().trimmed()));
} }
break; break;
default: default:
......
...@@ -66,7 +66,7 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::boardType(void) const ...@@ -66,7 +66,7 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::boardType(void) const
break; break;
case threeDRRadioVendorId: case threeDRRadioVendorId:
if (productIdentifier() == threeDRRadioProductId) { if (productIdentifier() == threeDRRadioProductId) {
qCDebug(QGCSerialPortInfoLog) << "Found 3DR Radio"; qCDebug(QGCSerialPortInfoLog) << "Found SiK Radio";
boardType = BoardType3drRadio; boardType = BoardType3drRadio;
} }
break; break;
......
...@@ -231,7 +231,7 @@ Rectangle { ...@@ -231,7 +231,7 @@ Rectangle {
} }
QGCCheckBox { QGCCheckBox {
text: "3DR Radio" text: "SiK Radio"
visible: !ScreenTools.isiOS visible: !ScreenTools.isiOS
checked: QGroundControl.linkManager.autoconnect3DRRadio checked: QGroundControl.linkManager.autoconnect3DRRadio
onClicked: QGroundControl.linkManager.autoconnect3DRRadio = checked onClicked: QGroundControl.linkManager.autoconnect3DRRadio = checked
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment