Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 347 → Rev 348

/Misc Projects/PcMarlinInterface/SerialController.cpp
4,6 → 4,10
{
connected = false;
speeds << "9600" << "19200" << "38400" << "57600" << "115200" << "230400" << "250000";
dataBits << "8 Bits" << "7 Bits" << "6 Bits" << "5 Bits";
stopBits << "1 Bit" << "1.5 Bits" << "2 Bits";
parity << "None" << "Even" << "Odd" << "Space" << "Mark";
flowControl << "None" << "Hardware" << "Software";
bufferInIndex = 0;
bufferInOverflow = false;
}
21,10 → 25,11
for (int i = 0; i < portsList.size(); i++) {
ports.append(portsList[i].portName());
}
emit Serial_UpdateParameters(ports, speeds);
emit Serial_UpdateParameters(ports, speeds, dataBits, stopBits, parity, flowControl);
}
 
void SerialController::Serial_Connect(QString port, QString speed)
void SerialController::Serial_Connect(QString port, QString speed, QString dataBits,
QString stopBits, QString parity, QString flowControl)
{
if (!connected) {
serialPort = new QSerialPort();
39,15 → 44,45
int baud = speed.toInt(&ok);
if (ok) serialPort->setBaudRate(baud);
 
serialPort->setDataBits(QSerialPort::Data8);
serialPort->setParity(QSerialPort::NoParity);
// serialPort->setFlowControl(QSerialPort::HardwareControl);
serialPort->setStopBits(QSerialPort::OneStop);
if (dataBits == "5 Bits")
serialPort->setDataBits(QSerialPort::Data5);
else if (dataBits == "6 Bits")
serialPort->setDataBits(QSerialPort::Data6);
else if (dataBits == "7 Bits")
serialPort->setDataBits(QSerialPort::Data7);
else
serialPort->setDataBits(QSerialPort::Data8);
 
if (stopBits == "1.5 Bits")
serialPort->setStopBits(QSerialPort::OneAndHalfStop);
else if (stopBits == "2 Bits")
serialPort->setStopBits(QSerialPort::TwoStop);
else
serialPort->setStopBits(QSerialPort::OneStop);
 
if (parity == "Even")
serialPort->setParity(QSerialPort::EvenParity);
else if (parity == "Odd")
serialPort->setParity(QSerialPort::OddParity);
else if (parity == "Space")
serialPort->setParity(QSerialPort::SpaceParity);
else if (parity == "Mark")
serialPort->setParity(QSerialPort::MarkParity);
else
serialPort->setParity(QSerialPort::NoParity);
 
if (flowControl == "Hardware")
serialPort->setFlowControl(QSerialPort::HardwareControl);
else if (flowControl == "Software")
serialPort->setFlowControl(QSerialPort::SoftwareControl);
else
serialPort->setFlowControl(QSerialPort::NoFlowControl);
 
// See http://umforum.ultimaker.com/index.php?/topic/5886-um2-controller-resetreboot-when-opening-usb-port-on-linux/
serialPort->setDataTerminalReady(1);
 
if (ok) emit Serial_Connected();
else Serial_Disconnect();
}
}
}