tempo-plotter Changeset - c3296528103c · protofusion repositories

Changeset - c3296528103c

Parent rev.

Child rev.

[Not reviewed]

control-signals

0 1 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-25 05:05:53
hy@ozderya.net

store signal status in leds and update output signals on port open

1 file changed with 18 insertions and 6 deletions:

src/portcontrol.cpp

0 comments (0 inline, 0 general)

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -109,64 +109,72 @@ PortControl::PortControl(QSerialPort* po @@
     QObject::connect(&dataBitsButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectDataBits);
     // setup stop bits selection buttons
     stopBitsButtons.addButton(ui->rb1StopBit, (int) QSerialPort::OneStop);
     stopBitsButtons.addButton(ui->rb2StopBit, (int) QSerialPort::TwoStop);
     QObject::connect(&stopBitsButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectStopBits);
     // setup flow control selection buttons
     flowControlButtons.addButton(ui->rbNoFlowControl,
                                  (int) QSerialPort::NoFlowControl);
     flowControlButtons.addButton(ui->rbHardwareControl,
                                  (int) QSerialPort::HardwareControl);
     flowControlButtons.addButton(ui->rbSoftwareControl,
                                  (int) QSerialPort::SoftwareControl);
     QObject::connect(&flowControlButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectFlowControl);
     // initialize signal leds
     ui->ledDTR->setOn(true);
     ui->ledRTS->setOn(true);
     // connect output signals
     connect(ui->pbDTR, &QPushButton::clicked, [this]()
+            {
                 // toggle DTR
                 serialPort->setDataTerminalReady(!serialPort->isDataTerminalReady());
                 ui->ledDTR->toggle();
                 if (serialPort->isOpen())
+                {
                     serialPort->setDataTerminalReady(ui->ledDTR->isOn());
+                }
             });
     connect(serialPort, &QSerialPort::dataTerminalReadyChanged,
             ui->ledDTR, &LedWidget::toggle);
     connect(ui->pbRTS, &QPushButton::clicked, [this]()
+            {
                 // toggle RTS
                 serialPort->setRequestToSend(!serialPort->isRequestToSend());
                 ui->ledRTS->toggle();
                 if (serialPort->isOpen())
+                {
                     serialPort->setRequestToSend(ui->ledRTS->isOn());
+                }
             });
     connect(serialPort, &QSerialPort::requestToSendChanged,
             ui->ledRTS, &LedWidget::toggle);
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
+}
 PortControl::~PortControl()
+{
     delete ui;
+}
 void PortControl::loadPortList()
+{
     QString currentSelection = ui->cbPortList->currentData(PortNameRole).toString();
     portList.loadPortList();
     int index = portList.indexOf(currentSelection);
     if (index >= 0)
+    {
         ui->cbPortList->setCurrentIndex(index);
         tbPortList.setCurrentIndex(index);
+    }
+}
 void PortControl::loadBaudRateList()
@@ @@ -254,48 +262,52 @@ void PortControl::togglePort() @@
+        {
             portList.appendRow(new PortListItem(portText));
             ui->cbPortList->setCurrentIndex(portList.rowCount()-1);
             tbPortList.setCurrentIndex(portList.rowCount()-1);
             portName = portText;
+        }
         else
+        {
             // get the port name from the data field
             portName = static_cast<PortListItem*>(portList.item(portIndex))->portName();
+        }
         serialPort->setPortName(ui->cbPortList->currentData(PortNameRole).toString());
         // open port
         if (serialPort->open(QIODevice::ReadWrite))
+        {
             // set port settings
             selectBaudRate(ui->cbBaudRate->currentText());
             selectParity((QSerialPort::Parity) parityButtons.checkedId());
             selectDataBits((QSerialPort::DataBits) dataBitsButtons.checkedId());
             selectStopBits((QSerialPort::StopBits) stopBitsButtons.checkedId());
             selectFlowControl((QSerialPort::FlowControl) flowControlButtons.checkedId());
             // set output signals
             serialPort->setDataTerminalReady(ui->ledDTR->isOn());
             serialPort->setRequestToSend(ui->ledRTS->isOn());
             qDebug() << "Opened port:" << serialPort->portName();
             emit portToggled(true);
+        }
+    }
     openAction.setChecked(serialPort->isOpen());
+}
 void PortControl::selectPort(QString portName)
+{
     // portName may be coming from combobox
     portName = portName.split(" ")[0];
     // has selection actually changed
     if (portName != serialPort->portName())
+    {
         // if another port is already open, close it by toggling
         if (serialPort->isOpen())
+        {
             togglePort();
             // open new selection by toggling
             togglePort();
+        }
+    }
+}

0 comments (0 inline, 0 general)