Commit 177f6583 authored by Don Gagne's avatar Don Gagne

Update to SiK radio naming

parent 368501b3
......@@ -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:
......
......@@ -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 {
......
......@@ -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);
......
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