Browse Source

Not auto-overwriting links, ignoring carriage return in console

QGC4.4
Lorenz Meier 13 years ago
parent
commit
3562e6026e
  1. 4
      src/ui/DebugConsole.cc
  2. 6
      src/ui/SerialConfigurationWindow.cc

4
src/ui/DebugConsole.cc

@ -419,7 +419,9 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes) @@ -419,7 +419,9 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes)
}
else
{
str.append(byte); // Append original character
// Ignore carriage return, because that
// is auto-added with '\n'
if (byte != '\r') str.append(byte); // Append original character
lastSpace = 0;
}
}

6
src/ui/SerialConfigurationWindow.cc

@ -212,11 +212,6 @@ void SerialConfigurationWindow::setupPortList() @@ -212,11 +212,6 @@ void SerialConfigurationWindow::setupPortList()
{
if (!link) return;
if (!userConfigured)
{
ui.portName->clear();
ui.portName->clearEditText();
}
// Get the ports available on this system
QVector<QString>* ports = link->getCurrentPorts();
@ -231,7 +226,6 @@ void SerialConfigurationWindow::setupPortList() @@ -231,7 +226,6 @@ void SerialConfigurationWindow::setupPortList()
}
}
ui.portName->setEditText(this->link->getPortName());
}

Loading…
Cancel
Save