Subversion Repositories Code-Repo

Rev

Rev 345 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 345 Rev 346
Line 32... Line 32...
32 
        serialPort->setPortName(port);
 32 
        serialPort->setPortName(port);
33 
        if (!serialPort->open(QIODevice::ReadWrite)) {
 33 
        if (!serialPort->open(QIODevice::ReadWrite)) {
34 
            Serial_Disconnect();
 34 
            Serial_Disconnect();
35 
        } else {
 35 
        } else {
36 
            connected = true;
 36 
            connected = true;
37 
            if (speed == "9600")
 37 
            bool ok = false;
38 
                serialPort->setBaudRate(9600);
 - 
 
39 
            else if (speed == "19200")
 - 
 
40 
                serialPort->setBaudRate(19200);
 - 
 
41 
            else if (speed == "38400")
 - 
 
42 
                serialPort->setBaudRate(38400);
 - 
 
- 
 
 38 
 
43 
            else if (speed == "57600")
 39 
            int baud = speed.toInt(&ok);
44 
                serialPort->setBaudRate(57600);
 40 
            if (ok) serialPort->setBaudRate(baud);
45 
            else if (speed == "115200")
 - 
 
46 
                serialPort->setBaudRate(115200);
 - 
 
47 
            else if (speed == "230400")
 - 
 
48 
                serialPort->setBaudRate(230400);
 - 
 
49 
            else if (speed == "250000")
 - 
 
50 
                serialPort->setBaudRate(250000);
 - 
 
51 
 
 41 
 
52 
            serialPort->setDataBits(QSerialPort::Data8);
 42 
            serialPort->setDataBits(QSerialPort::Data8);
53 
            serialPort->setParity(QSerialPort::NoParity);
 43 
            serialPort->setParity(QSerialPort::NoParity);
54 
//            serialPort->setFlowControl(QSerialPort::HardwareControl);
 44 
//            serialPort->setFlowControl(QSerialPort::HardwareControl);
55 
            serialPort->setStopBits(QSerialPort::OneStop);
 45 
            serialPort->setStopBits(QSerialPort::OneStop);
56 
 
 46 
 
57 
            // See http://umforum.ultimaker.com/index.php?/topic/5886-um2-controller-resetreboot-when-opening-usb-port-on-linux/
 47 
            // See http://umforum.ultimaker.com/index.php?/topic/5886-um2-controller-resetreboot-when-opening-usb-port-on-linux/
58 
            serialPort->setDataTerminalReady(1);
 48 
            serialPort->setDataTerminalReady(1);
- 
 
 49 
 
59 
            emit Serial_Connected();
 50 
            if (ok) emit Serial_Connected();
60 
        }
 51 
        }
61 
    }
 52 
    }
62 
}
 53 
}
63 
 
 54 
 
64 
void SerialController::Serial_Disconnect()
 55 
void SerialController::Serial_Disconnect()