Skip to content

Q
qgroundcontrol
Commit 0ac444d9 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Naming changes 

No need to add dynamic MockLink comm links
parent 4f5346de
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 23 deletions
src/comm/LinkManager.cc
View file @ 0ac444d9
...@@ -47,7 +47,7 @@ const char* LinkManager::_autoconnect3DRRadioKey = "Autoconnect3DRRadio"; ...@@ -47,7 +47,7 @@ const char* LinkManager::_autoconnect3DRRadioKey = "Autoconnect3DRRadio";
const char* LinkManager::_autoconnectPX4FlowKey = "AutoconnectPX4Flow"; const char* LinkManager::_autoconnectPX4FlowKey = "AutoconnectPX4Flow";
const char* LinkManager::_autoconnectRTKGPSKey = "AutoconnectRTKGPS"; const char* LinkManager::_autoconnectRTKGPSKey = "AutoconnectRTKGPS";
const char* LinkManager::_autoconnectLibrePilotKey = "AutoconnectLibrePilot"; const char* LinkManager::_autoconnectLibrePilotKey = "AutoconnectLibrePilot";
const char* LinkManager::_defaultUPDLinkName = "Default UDP Link"; const char* LinkManager::_defaultUPDLinkName = "UDP Link (AutoConnect)";
const int LinkManager::_autoconnectUpdateTimerMSecs = 1000; const int LinkManager::_autoconnectUpdateTimerMSecs = 1000;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
...@@ -353,9 +353,6 @@ void LinkManager::saveLinkConfigurationList() ...@@ -353,9 +353,6 @@ void LinkManager::saveLinkConfigurationList()
void LinkManager::loadLinkConfigurationList() void LinkManager::loadLinkConfigurationList()
{ {
bool linksChanged = false; bool linksChanged = false;
#ifdef QT_DEBUG
bool mockPresent = false;
#endif
QSettings settings; QSettings settings;
// Is the group even there? // Is the group even there?
if(settings.contains(LinkConfiguration::settingsRoot() + "/count")) { if(settings.contains(LinkConfiguration::settingsRoot() + "/count")) {
...@@ -397,7 +394,6 @@ void LinkManager::loadLinkConfigurationList() ...@@ -397,7 +394,6 @@ void LinkManager::loadLinkConfigurationList()
#ifdef QT_DEBUG #ifdef QT_DEBUG
case LinkConfiguration::TypeMock: case LinkConfiguration::TypeMock:
pLink = (LinkConfiguration*)new MockConfiguration(name); pLink = (LinkConfiguration*)new MockConfiguration(name);
mockPresent = true;
break; break;
#endif #endif
default: default:
...@@ -425,16 +421,6 @@ void LinkManager::loadLinkConfigurationList() ...@@ -425,16 +421,6 @@ void LinkManager::loadLinkConfigurationList()
} }
} }
} }
// Debug buids always add MockLink automatically (if one is not already there)
#ifdef QT_DEBUG
if(!mockPresent)
{
MockConfiguration* pMock = new MockConfiguration("Mock Link PX4");
pMock->setDynamic(true);
_linkConfigurations.append(pMock);
linksChanged = true;
}
#endif
if(linksChanged) { if(linksChanged) {
emit linkConfigurationsChanged(); emit linkConfigurationsChanged();
...@@ -544,47 +530,47 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -544,47 +530,47 @@ void LinkManager::_updateAutoConnectLinks(void)
case QGCSerialPortInfo::BoardTypePX4FMUV2: case QGCSerialPortInfo::BoardTypePX4FMUV2:
case QGCSerialPortInfo::BoardTypePX4FMUV4: case QGCSerialPortInfo::BoardTypePX4FMUV4:
if (_autoconnectPixhawk) { if (_autoconnectPixhawk) {
pSerialConfig = new SerialConfiguration(QString("Pixhawk on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("Pixhawk on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
pSerialConfig->setUsbDirect(true); pSerialConfig->setUsbDirect(true);
} }
break; break;
case QGCSerialPortInfo::BoardTypeAeroCore: case QGCSerialPortInfo::BoardTypeAeroCore:
if (_autoconnectPixhawk) { if (_autoconnectPixhawk) {
pSerialConfig = new SerialConfiguration(QString("AeroCore on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("AeroCore on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
pSerialConfig->setUsbDirect(true); pSerialConfig->setUsbDirect(true);
} }
break; break;
case QGCSerialPortInfo::BoardTypeMINDPXFMUV2: case QGCSerialPortInfo::BoardTypeMINDPXFMUV2:
if (_autoconnectPixhawk) { if (_autoconnectPixhawk) {
pSerialConfig = new SerialConfiguration(QString("MindPX on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("MindPX on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
pSerialConfig->setUsbDirect(true); pSerialConfig->setUsbDirect(true);
} }
break; break;
case QGCSerialPortInfo::BoardTypeTAPV1: case QGCSerialPortInfo::BoardTypeTAPV1:
if (_autoconnectPixhawk) { if (_autoconnectPixhawk) {
pSerialConfig = new SerialConfiguration(QString("TAP on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("TAP on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
pSerialConfig->setUsbDirect(true); pSerialConfig->setUsbDirect(true);
} }
break; break;
case QGCSerialPortInfo::BoardTypeASCV1: case QGCSerialPortInfo::BoardTypeASCV1:
if (_autoconnectPixhawk) { if (_autoconnectPixhawk) {
pSerialConfig = new SerialConfiguration(QString("ASC on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("ASC on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
pSerialConfig->setUsbDirect(true); pSerialConfig->setUsbDirect(true);
} }
break; break;
case QGCSerialPortInfo::BoardTypePX4Flow: case QGCSerialPortInfo::BoardTypePX4Flow:
if (_autoconnectPX4Flow) { if (_autoconnectPX4Flow) {
pSerialConfig = new SerialConfiguration(QString("PX4Flow on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("PX4Flow on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
} }
break; break;
case QGCSerialPortInfo::BoardTypeSikRadio: case QGCSerialPortInfo::BoardTypeSikRadio:
if (_autoconnect3DRRadio) { if (_autoconnect3DRRadio) {
pSerialConfig = new SerialConfiguration(QString("SiK Radio on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("SiK Radio on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
} }
break; break;
case QGCSerialPortInfo::BoardTypeLibrePilot: case QGCSerialPortInfo::BoardTypeLibrePilot:
if (_autoconnectLibrePilot) { if (_autoconnectLibrePilot) {
pSerialConfig = new SerialConfiguration(QString("LibrePilot on %1").arg(portInfo.portName().trimmed())); pSerialConfig = new SerialConfiguration(tr("LibrePilot on %1 (AutoConnect)").arg(portInfo.portName().trimmed()));
} }
break; break;
#ifndef __mobile__ #ifndef __mobile__
......
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