Merge pull request #2943 from DonLakeFlyer/SiKRadioNaming

Change 3DR Radio -> SiK Radio

src/VehicleSetup/FirmwareUpgrade.qml

@@ -42,7 +42,7 @@ QGCView {
     readonly property string title:             "FIRMWARE"
     readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
     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 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 + "."

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.

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:

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;

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