diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-02-08 10:37:40 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-02-09 09:26:41 +0100 |
commit | 0fe69bca7e4e71af580672aa63dd61e0a632cc17 (patch) | |
tree | 3f2cfd22e659775f9a7e41d9e0b0cf120d97f573 /examples | |
parent | bdb0beba30e42603e13a24eb2202086b7e7c5044 (diff) |
Qt SerialPort: remove not used source files
Task-number: QTBUG-89882
Change-Id: I474c0d82d293636f5b8816a88d078fcfe1a91f18
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/serialport/slave/slavethread.cpp | 146 | ||||
-rw-r--r-- | examples/serialport/slave/slavethread.h | 82 |
2 files changed, 0 insertions, 228 deletions
diff --git a/examples/serialport/slave/slavethread.cpp b/examples/serialport/slave/slavethread.cpp deleted file mode 100644 index b6394c66..00000000 --- a/examples/serialport/slave/slavethread.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Denis Shienkov <denis.shienkov@gmail.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSerialPort module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "slavethread.h" - -#include <QtSerialPort/QSerialPort> - -#include <QTime> - -QT_USE_NAMESPACE - -SlaveThread::SlaveThread(QObject *parent) - : QThread(parent), waitTimeout(0), quit(false) -{ -} - -SlaveThread::~SlaveThread() -{ - mutex.lock(); - quit = true; - mutex.unlock(); - wait(); -} - -void SlaveThread::startSlave(const QString &portName, int waitTimeout, const QString &response) -{ - QMutexLocker locker(&mutex); - this->portName = portName; - this->waitTimeout = waitTimeout; - this->response = response; - - if (!isRunning()) - start(); -} - -void SlaveThread::run() -{ - bool currentPortNameChanged = false; - - mutex.lock(); - QString currentPortName; - if (currentPortName != portName) { - currentPortName = portName; - currentPortNameChanged = true; - } - - int currentWaitTimeout = waitTimeout; - QString currentRespone = response; - mutex.unlock(); - - QSerialPort serial; - - while (!quit) { - - if (currentPortNameChanged) { - serial.close(); - serial.setPortName(currentPortName); - - if (!serial.open(QIODevice::ReadWrite)) { - emit error(tr("Can't open %1, error code %2") - .arg(portName).arg(serial.error())); - return; - } - } - - if (serial.waitForReadyRead(currentWaitTimeout)) { - - // read all request - QByteArray requestData = serial.readAll(); - while (serial.waitForReadyRead(10)) - requestData += serial.readAll(); - - // write all response - QByteArray responseData = currentRespone.toLocal8Bit(); - serial.write(responseData); - if (serial.waitForBytesWritten(waitTimeout)) { - QString request(requestData); - emit this->request(request); - } else { - emit timeout(tr("Wait write response timeout %1") - .arg(QTime::currentTime().toString())); - } - } else { - emit timeout(tr("Wait read request timeout %1") - .arg(QTime::currentTime().toString())); - } - - mutex.lock(); - if (currentPortName != portName) { - currentPortName = portName; - currentPortNameChanged = true; - } else { - currentPortNameChanged = false; - } - currentWaitTimeout = waitTimeout; - currentRespone = response; - mutex.unlock(); - } -} diff --git a/examples/serialport/slave/slavethread.h b/examples/serialport/slave/slavethread.h deleted file mode 100644 index 6ef9d2b1..00000000 --- a/examples/serialport/slave/slavethread.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Denis Shienkov <denis.shienkov@gmail.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSerialPort module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SLAVETHREAD_H -#define SLAVETHREAD_H - -#include <QThread> -#include <QMutex> -#include <QWaitCondition> - -class SlaveThread : public QThread -{ - Q_OBJECT - -public: - SlaveThread(QObject *parent = 0); - ~SlaveThread(); - - void startSlave(const QString &portName, int waitTimeout, const QString &response); - void run(); - -signals: - void request(const QString &s); - void error(const QString &s); - void timeout(const QString &s); - -private: - QString portName; - QString response; - int waitTimeout; - QMutex mutex; - bool quit; -}; - -#endif // SLAVETHREAD_H |