34,21 → 34,11 |
Serial_Disconnect(); |
} else { |
connected = true; |
if (speed == "9600") |
serialPort->setBaudRate(9600); |
else if (speed == "19200") |
serialPort->setBaudRate(19200); |
else if (speed == "38400") |
serialPort->setBaudRate(38400); |
else if (speed == "57600") |
serialPort->setBaudRate(57600); |
else if (speed == "115200") |
serialPort->setBaudRate(115200); |
else if (speed == "230400") |
serialPort->setBaudRate(230400); |
else if (speed == "250000") |
serialPort->setBaudRate(250000); |
bool ok = false; |
|
int baud = speed.toInt(&ok); |
if (ok) serialPort->setBaudRate(baud); |
|
serialPort->setDataBits(QSerialPort::Data8); |
serialPort->setParity(QSerialPort::NoParity); |
// serialPort->setFlowControl(QSerialPort::HardwareControl); |
56,7 → 46,8 |
|
// See http://umforum.ultimaker.com/index.php?/topic/5886-um2-controller-resetreboot-when-opening-usb-port-on-linux/ |
serialPort->setDataTerminalReady(1); |
emit Serial_Connected(); |
|
if (ok) emit Serial_Connected(); |
} |
} |
} |