WebSVN – Code-Repo – Diff – /Misc Projects/PcMarlinInterface/SerialController.cpp

 #include "SerialController.h"
-SerialController::SerialController(QObject *parent) : QObject(parent)
+SerialController::SerialController(QWidget *parent) : QWidget(parent)
+{
-    connected = false;
+    // Serial connection UI
+    btnSerialConnect = new QPushButton("&Connect");
+    btnSerialRefresh = new QPushButton("&Refresh");
+    labelSerialPort = new QLabel("Serial Port:");
+    labelSerialSpeed = new QLabel("Baud Rate:");
+    labelSerialDataBits = new QLabel("Data:");
+    labelSerialStopBits = new QLabel("Stop:");
+    labelSerialParity = new QLabel("Parity Bit:");
+    labelSerialFlowControl = new QLabel("Flow Control:");
+    cboxSerialPort = new QComboBox();
+    cboxSerialPort->setMinimumWidth(80);
+    cboxSerialSpeed = new QComboBox();
+    cboxSerialSpeed->setEditable(true);
-    speeds << "9600" << "19200" << "38400" << "57600" << "115200" << "230400" << "250000";
+    cboxSerialSpeed->setValidator(new QIntValidator(0, 100000000, this));
-    dataBits << "8 Bits" << "7 Bits" << "6 Bits" << "5 Bits";
+    cboxSerialDataBits = new QComboBox();
+    cboxSerialDataBits->setMaximumWidth(60);
-    stopBits << "1 Bit" << "1.5 Bits" << "2 Bits";
+    cboxSerialStopBits = new QComboBox();
+    cboxSerialStopBits->setMaximumWidth(60);
+    cboxSerialParity = new QComboBox();
+    cboxSerialFlowControl = new QComboBox();
+    cboxSerialFlowControl->setMinimumWidth(70);
-    parity << "None" << "Even" << "Odd" << "Space" << "Mark";
+    QGridLayout *serialSettingsLayout = new QGridLayout();
+    serialSettingsLayout->addWidget(btnSerialConnect, 0, 0);
+    serialSettingsLayout->addWidget(labelSerialPort, 0, 1);
+    serialSettingsLayout->addWidget(cboxSerialPort, 0, 2);
+    serialSettingsLayout->addWidget(labelSerialDataBits, 0, 3);
+    serialSettingsLayout->addWidget(cboxSerialDataBits, 0, 4);
+    serialSettingsLayout->addWidget(labelSerialParity, 0, 5);
+    serialSettingsLayout->addWidget(cboxSerialParity, 0, 6);
+    serialSettingsLayout->addWidget(btnSerialRefresh, 1, 0);
+    serialSettingsLayout->addWidget(labelSerialSpeed, 1, 1);
+    serialSettingsLayout->addWidget(cboxSerialSpeed, 1, 2);
+    serialSettingsLayout->addWidget(labelSerialStopBits, 1, 3);
+    serialSettingsLayout->addWidget(cboxSerialStopBits, 1, 4);
+    serialSettingsLayout->addWidget(labelSerialFlowControl, 1, 5);
+    serialSettingsLayout->addWidget(cboxSerialFlowControl, 1, 6);
+    setLayout(serialSettingsLayout);
+    serialHelper = new SerialHelper();
+    serialThread = new QThread();
-    flowControl << "None" << "Hardware" << "Software";
+    serialHelper->moveToThread(serialThread);
+    connect(serialHelper, SIGNAL(UpdateStatus(QString)), this, SIGNAL(UpdateStatus(QString)));
+    // Parameters
+    connect(this, SIGNAL(Serial_QueryParameters()), serialHelper, SLOT(Serial_QueryParameters()));
+    connect(serialHelper, SIGNAL(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)),
+            this, SLOT(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)));
+    // Connect
+    connect(this, SIGNAL(Serial_Connect(QString,QString,QString,QString,QString,QString)),
+            serialHelper, SLOT(Serial_Connect(QString,QString,QString,QString,QString,QString)));
+    connect(serialHelper, SIGNAL(Serial_Connected()), this, SIGNAL(Serial_Connected()));
+    connect(serialHelper, SIGNAL(Serial_Connected()), this, SLOT(Serial_LocalConnected()));
-    bufferInIndex = 0;
+    // Disconnect
+    connect(this, SIGNAL(Serial_Disconnect()), serialHelper, SLOT(Serial_Disconnect()));
+    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SIGNAL(Serial_Disconnected()));
+    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SLOT(Serial_LocalDisconnected()));
+    // Transmit
+    connect(this, SIGNAL(Serial_TransmitString(QString)), serialHelper, SLOT(Serial_TransmitString(QString)));
+    connect(this, SIGNAL(Serial_TransmitByteArray(QByteArray)), serialHelper, SLOT(Serial_TransmitByteArray(QByteArray)));
+    // Receive
+    connect(serialHelper, SIGNAL(Serial_ReceivedByte(char)), this, SIGNAL(Serial_ReceivedByte(char)));
+    // Threading
+    connect(serialThread, SIGNAL(finished()), serialHelper, SLOT(deleteLater()));
-    bufferInOverflow = false;
+    serialThread->start();
-}
+    // Local GUI
+    connect(btnSerialConnect, SIGNAL(clicked()), this, SLOT(Serial_ConnectToggleBtn()));
+    connect(btnSerialRefresh, SIGNAL(clicked()), this, SIGNAL(Serial_QueryParameters()));
-SerialController::~SerialController()
+    emit Serial_QueryParameters();
-{
-    serialPort->close();
+    Serial_LocalDisconnected();
-    delete serialPort;
+}
-void SerialController::Serial_QueryParameters()
+SerialController::~SerialController()
+{
-    QList<QSerialPortInfo> portsList = QSerialPortInfo::availablePorts();
-    QStringList ports;
+    serialThread->quit();
-    for (int i = 0; i < portsList.size(); i++) {
-        ports.append(portsList[i].portName());
-    }
-    emit Serial_UpdateParameters(ports, speeds, dataBits, stopBits, parity, flowControl);
+}
-void SerialController::Serial_Connect(QString port, QString speed, QString dataBits,
+void SerialController::Serial_UpdateParameters(QStringList ports, QStringList speeds, QStringList dataBits,
-                            QString stopBits, QString parity, QString flowControl)
+                                               QStringList stopBits, QStringList parity, QStringList flowControl)
+{
-    if (!connected) {
+    QString currPort = cboxSerialPort->currentText();
-        serialPort = new QSerialPort();
+    cboxSerialPort->clear();
-        connect(serialPort, SIGNAL(readyRead()), this, SLOT(Serial_ProcessIncomingData()));
+    cboxSerialPort->addItems(ports);
-        serialPort->setPortName(port);
+    if (currPort != "" && ports.contains(currPort))
-        if (!serialPort->open(QIODevice::ReadWrite)) {
+        cboxSerialPort->setCurrentText(currPort);
-            Serial_Disconnect();
+    QString currSpeed = cboxSerialSpeed->currentText();
-        } else {
+    cboxSerialSpeed->clear();
-            connected = true;
+    cboxSerialSpeed->addItems(speeds);
-            bool ok = false;
+    if (currSpeed != "") cboxSerialSpeed->setCurrentText(currSpeed);
+    int currData = cboxSerialDataBits->currentIndex();
+    cboxSerialDataBits->clear();
-            int baud = speed.toInt(&ok);
+    cboxSerialDataBits->addItems(dataBits);
-            if (ok) serialPort->setBaudRate(baud);
+    if (currData >= 0) cboxSerialDataBits->setCurrentIndex(currData);
-            if (dataBits == "5 Bits")
+    int currStop = cboxSerialStopBits->currentIndex();
-                serialPort->setDataBits(QSerialPort::Data5);
+    cboxSerialStopBits->clear();
-            else if (dataBits == "6 Bits")
+    cboxSerialStopBits->addItems(stopBits);
-                serialPort->setDataBits(QSerialPort::Data6);
+    if (currStop >= 0) cboxSerialStopBits->setCurrentIndex(currStop);
-            else if (dataBits == "7 Bits")
+    int currParity = cboxSerialParity->currentIndex();
-                serialPort->setDataBits(QSerialPort::Data7);
+    cboxSerialParity->clear();
-            else
+    cboxSerialParity->addItems(parity);
-                serialPort->setDataBits(QSerialPort::Data8);
+    if (currParity >= 0) cboxSerialParity->setCurrentIndex(currParity);
-            if (stopBits == "1.5 Bits")
+    int currFlow = cboxSerialFlowControl->currentIndex();
-                serialPort->setStopBits(QSerialPort::OneAndHalfStop);
+    cboxSerialFlowControl->clear();
-            else if (stopBits == "2 Bits")
+    cboxSerialFlowControl->addItems(flowControl);
-                serialPort->setStopBits(QSerialPort::TwoStop);
+    if (currFlow >= 0) cboxSerialFlowControl->setCurrentIndex(currFlow);
-            else
+}
-                serialPort->setStopBits(QSerialPort::OneStop);
+void SerialController::Serial_LocalConnected()
+{
-            if (parity == "Even")
+    btnSerialConnect->setText("&Disconnect");
-                serialPort->setParity(QSerialPort::EvenParity);
+//    cboxSerialPort->setEnabled(false);
-            else if (parity == "Odd")
+//    cboxSerialSpeed->setEnabled(false);
-                serialPort->setParity(QSerialPort::OddParity);
+//    cboxSerialDataBits->setEnabled(false);
-            else if (parity == "Space")
+//    cboxSerialStopBits->setEnabled(false);
-                serialPort->setParity(QSerialPort::SpaceParity);
+//    cboxSerialParity->setEnabled(false);
+//    cboxSerialFlowControl->setEnabled(false);
+//    btnSerialRefresh->setEnabled(false);
+    btnSerialRefresh->hide();
+    labelSerialPort->hide();
+    labelSerialSpeed->hide();
+    labelSerialDataBits->hide();
+    labelSerialStopBits->hide();
-            else if (parity == "Mark")
+    labelSerialParity->hide();
+    labelSerialFlowControl->hide();
-                serialPort->setParity(QSerialPort::MarkParity);
+    cboxSerialPort->hide();
-            else
+    cboxSerialSpeed->hide();
+    cboxSerialDataBits->hide();
+    cboxSerialStopBits->hide();
+    cboxSerialParity->hide();
+    cboxSerialFlowControl->hide();
-                serialPort->setParity(QSerialPort::NoParity);
+    emit UpdateStatus("Serial: Connected");
+}
+void SerialController::Serial_LocalDisconnected()
+{
+    btnSerialConnect->setText("&Connect");
+//    cboxSerialPort->setEnabled(true);
+//    cboxSerialSpeed->setEnabled(true);
+//    cboxSerialDataBits->setEnabled(true);
+//    cboxSerialStopBits->setEnabled(true);
+//    cboxSerialParity->setEnabled(true);
-            if (flowControl == "Hardware")
+//    cboxSerialFlowControl->setEnabled(true);
-                serialPort->setFlowControl(QSerialPort::HardwareControl);
+//    btnSerialRefresh->setEnabled(true);
+    btnSerialRefresh->show();
+    labelSerialPort->show();
+    labelSerialSpeed->show();
+    labelSerialDataBits->show();
+    labelSerialStopBits->show();
+    labelSerialParity->show();
-            else if (flowControl == "Software")
+    labelSerialFlowControl->show();
-                serialPort->setFlowControl(QSerialPort::SoftwareControl);
+    cboxSerialPort->show();
-            else
+    cboxSerialSpeed->show();
+    cboxSerialDataBits->show();
+    cboxSerialStopBits->show();
+    cboxSerialParity->show();
+    cboxSerialFlowControl->show();
-                serialPort->setFlowControl(QSerialPort::NoFlowControl);
+    emit UpdateStatus("Serial: Disconnected");
+}
-            // See http://umforum.ultimaker.com/index.php?/topic/5886-um2-controller-resetreboot-when-opening-usb-port-on-linux/
-            serialPort->setDataTerminalReady(1);
+void SerialController::Serial_ConnectToggleBtn()
+{
-            if (ok) emit Serial_Connected();
+    if (serialHelper->connected) {
-            else Serial_Disconnect();
+        emit Serial_Disconnect();
+    } else {
+        if (cboxSerialPort->currentText() != "" && cboxSerialSpeed->currentText() != "") {
+            emit Serial_Connect(cboxSerialPort->currentText(), cboxSerialSpeed->currentText(), cboxSerialDataBits->currentText(),
+                                cboxSerialStopBits->currentText(), cboxSerialParity->currentText(), cboxSerialFlowControl->currentText());
+        }
+    }
+}
-void SerialController::Serial_Disconnect()
-{
-    serialPort->close();
-    delete serialPort;
-    connected = false;
-    emit Serial_Disconnected();
-}
-void SerialController::Serial_TransmitString(QString string)
-{
-    serialPort->write(string.toStdString().c_str());
-    serialPort->write(SERIAL_NEWLINE_CHAR);
-}
-void SerialController::Serial_ProcessIncomingData()
+//void SerialController::Serial_ProcessIncomingData()
-{
+//{
-    char tmpBuffer[SERIAL_BUFFER_SIZE];
+//    char tmpBuffer[SERIAL_BUFFER_SIZE];
-    int len = serialPort->read(tmpBuffer, sizeof(tmpBuffer));
+//    int len = serialPort->read(tmpBuffer, sizeof(tmpBuffer));
-    while (len > 0) {
+//    while (len > 0) {
-        for (int i = 0; i < len; i++) {
+//        for (int i = 0; i < len; i++) {
-            // Save received data into local buffer
+//            // Save received data into local buffer
-            bufferIn[bufferInIndex] = tmpBuffer[i];
+//            bufferIn[bufferInIndex] = tmpBuffer[i];
-            // If newline char is received, end current string
+//            // If newline char is received, end current string
-            if (tmpBuffer[i] == '\n') {
+//            if (tmpBuffer[i] == '\n') {
-                if (bufferInOverflow)
+//                if (bufferInOverflow)
-                    currString.append(QString::fromLocal8Bit(bufferIn, bufferInIndex));
+//                    currString.append(QString::fromLocal8Bit(bufferIn, bufferInIndex));
-                else
+//                else
-                    currString = QString::fromLocal8Bit(bufferIn, bufferInIndex);
+//                    currString = QString::fromLocal8Bit(bufferIn, bufferInIndex);
-                bufferInOverflow = false;
+//                bufferInOverflow = false;
-                bufferInIndex = 0;
+//                bufferInIndex = 0;
-                emit Serial_ReceivedString(currString);
+//                emit Serial_ReceivedString(currString);
-            } else {
+//            } else {
-                bufferInIndex++;
+//                bufferInIndex++;
-            }
+//            }
-            // If received string is larger than our serial buffer, append to previous data
+//            // If received string is larger than our serial buffer, append to previous data
-            if (bufferInIndex == SERIAL_BUFFER_SIZE-1) {
+//            if (bufferInIndex == SERIAL_BUFFER_SIZE-1) {
-                bufferIn[SERIAL_BUFFER_SIZE-1] = 0x0;
+//                bufferIn[SERIAL_BUFFER_SIZE-1] = 0x0;
-                if (bufferInOverflow)
+//                if (bufferInOverflow)
-                    currString.append(QString::fromLocal8Bit(bufferIn, bufferInIndex));
+//                    currString.append(QString::fromLocal8Bit(bufferIn, bufferInIndex));
-                else
+//                else
-                    currString = QString::fromLocal8Bit(bufferIn, bufferInIndex);
+//                    currString = QString::fromLocal8Bit(bufferIn, bufferInIndex);
-                bufferInOverflow = true;
+//                bufferInOverflow = true;
-                bufferInIndex = 0;
+//                bufferInIndex = 0;
-            }
+//            }
-        }
+//        }
-        // Check if there is more data to be read from the serial port
+//        // Check if there is more data to be read from the serial port
-        len = serialPort->read(tmpBuffer, sizeof(tmpBuffer));
+//        len = serialPort->read(tmpBuffer, sizeof(tmpBuffer));
-    }
+//    }
-}
+//}

Subversion Repositories Code-Repo

(root)/Misc Projects/PcMarlinInterface/SerialController.cpp @ 352 – Rev 348 → 351