From 177f6583483fe9cbf48738006106a650180f6ba9 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 23 Mar 2016 18:11:19 -0700
Subject: [PATCH] Update to SiK radio naming

---
 src/VehicleSetup/FirmwareUpgradeController.cc | 4 ++--
 src/VehicleSetup/PX4FirmwareUpgradeThread.cc  | 2 +-
 src/comm/LinkManager.cc                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index 908bdb983..3d195f7e5 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -147,7 +147,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort
         _foundBoardTypeName = "PX4 Flow";
         _startFlashWhenBootloaderFound = false;
         break;
-    case QGCSerialPortInfo::BoardType3drRadio:
+    case QGCSerialPortInfo::BoardTypeSikRadio:
         _foundBoardTypeName = "SiK Radio";
         if (!firstAttempt) {
             // Radio always flashes latest firmware, so we can start right away without
@@ -413,7 +413,7 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
     case QGCSerialPortInfo::BoardTypePX4Flow:
         boardId = Bootloader::boardIDPX4Flow;
         break;
-    case QGCSerialPortInfo::BoardType3drRadio:
+    case QGCSerialPortInfo::BoardTypeSikRadio:
         boardId = Bootloader::boardID3DRRadio;
         break;
     case QGCSerialPortInfo::BoardTypeUnknown:
diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
index e0a92ce26..6b7b78300 100644
--- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
@@ -106,7 +106,7 @@ void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void)
             _foundBoardPortInfo = portInfo;
             emit foundBoard(_findBoardFirstAttempt, portInfo, boardType);
             if (!_findBoardFirstAttempt) {
-                if (boardType == QGCSerialPortInfo::BoardType3drRadio) {
+                if (boardType == QGCSerialPortInfo::BoardTypeSikRadio) {
                     _3drRadioForceBootloader(portInfo);
                     return;
                 } else {
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 00561839a..6840343c8 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -536,7 +536,7 @@ void LinkManager::_updateAutoConnectLinks(void)
                         pSerialConfig = new SerialConfiguration(QString("PX4Flow on %1").arg(portInfo.portName().trimmed()));
                     }
                     break;
-                case QGCSerialPortInfo::BoardType3drRadio:
+                case QGCSerialPortInfo::BoardTypeSikRadio:
                     if (_autoconnect3DRRadio) {
                         pSerialConfig = new SerialConfiguration(QString("SiK Radio on %1").arg(portInfo.portName().trimmed()));
                     }
@@ -548,7 +548,7 @@ void LinkManager::_updateAutoConnectLinks(void)
 
                 if (pSerialConfig) {
                     qCDebug(LinkManagerLog) << "New auto-connect port added: " << pSerialConfig->name() << portInfo.systemLocation();
-                    pSerialConfig->setBaud(boardType == QGCSerialPortInfo::BoardType3drRadio ? 57600 : 115200);
+                    pSerialConfig->setBaud(boardType == QGCSerialPortInfo::BoardTypeSikRadio ? 57600 : 115200);
                     pSerialConfig->setDynamic(true);
                     pSerialConfig->setPortName(portInfo.systemLocation());
                     _autoconnectConfigurations.append(pSerialConfig);
-- 
2.22.0