diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index cdea17adad8ca076525815e859f0557c8a909d1e..0af3893066c89cf51537b6a1aaba46dd0834c474 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -42,7 +42,7 @@ QGCView { readonly property string title: "FIRMWARE" readonly property string highlightPrefix: "" readonly property string highlightSuffix: "" - 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: "" + highlightPrefix + "Plug in your device" + highlightSuffix + " via USB to " + highlightPrefix + "start" + highlightSuffix + " firmware upgrade." 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 + "." diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index faa2fe7045702786c569ce656e1cb9124f0dc028..908bdb98345cf28fdce7c94bcb75eef3a1cb9bb9 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -148,7 +148,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort _startFlashWhenBootloaderFound = false; break; case QGCSerialPortInfo::BoardType3drRadio: - _foundBoardTypeName = "3DR Radio"; + _foundBoardTypeName = "SiK Radio"; if (!firstAttempt) { // Radio always flashes latest firmware, so we can start right away without // any further user input. diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc index 3e95f3fa5c83ec0abf4986269af00899f73758d5..6490d731b49480a051bd05c88755ba02b999d7ed 100644 --- a/src/comm/LinkManager.cc +++ b/src/comm/LinkManager.cc @@ -536,7 +536,7 @@ void LinkManager::_updateAutoConnectLinks(void) break; case QGCSerialPortInfo::BoardType3drRadio: 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; default: diff --git a/src/comm/QGCSerialPortInfo.cc b/src/comm/QGCSerialPortInfo.cc index 4bd55fc1182359828ff5cd3c989419d22f336743..2a978a8855272116cd377aa03632bbea848a43df 100644 --- a/src/comm/QGCSerialPortInfo.cc +++ b/src/comm/QGCSerialPortInfo.cc @@ -66,7 +66,7 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::boardType(void) const break; case threeDRRadioVendorId: if (productIdentifier() == threeDRRadioProductId) { - qCDebug(QGCSerialPortInfoLog) << "Found 3DR Radio"; + qCDebug(QGCSerialPortInfoLog) << "Found SiK Radio"; boardType = BoardType3drRadio; } break; diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 04b361b9ddfc5c56aab42ba93af6a7805d5f03da..960d73cc41a52f333d7802d1e543330e017f4da9 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -231,7 +231,7 @@ Rectangle { } QGCCheckBox { - text: "3DR Radio" + text: "SiK Radio" visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnect3DRRadio onClicked: QGroundControl.linkManager.autoconnect3DRRadio = checked