diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/TimeReplicator.h b/DeviceHub/device/TimeReplicator.h index 3d57a76..128c355 100644 --- a/DeviceHub/device/TimeReplicator.h +++ b/DeviceHub/device/TimeReplicator.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/TimeReplicator.h b/DeviceHub/device/TimeReplicator.h index 3d57a76..128c355 100644 --- a/DeviceHub/device/TimeReplicator.h +++ b/DeviceHub/device/TimeReplicator.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeSwitcher.cpp b/DeviceHub/device/TimeSwitcher.cpp index bdeadad..12b23f9 100644 --- a/DeviceHub/device/TimeSwitcher.cpp +++ b/DeviceHub/device/TimeSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "05"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeSwitcher::dataBReceivedHandler); connect(this, &TimeSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->tmSwitForm, &TimeSwitcherForm::drawDeviceFrameOnForm); @@ -58,19 +56,6 @@ dataBuff.clear(); } } -void TimeSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void TimeSwitcher::frameParse(QList frameList) { @@ -153,9 +138,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/TimeReplicator.h b/DeviceHub/device/TimeReplicator.h index 3d57a76..128c355 100644 --- a/DeviceHub/device/TimeReplicator.h +++ b/DeviceHub/device/TimeReplicator.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeSwitcher.cpp b/DeviceHub/device/TimeSwitcher.cpp index bdeadad..12b23f9 100644 --- a/DeviceHub/device/TimeSwitcher.cpp +++ b/DeviceHub/device/TimeSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "05"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeSwitcher::dataBReceivedHandler); connect(this, &TimeSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->tmSwitForm, &TimeSwitcherForm::drawDeviceFrameOnForm); @@ -58,19 +56,6 @@ dataBuff.clear(); } } -void TimeSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void TimeSwitcher::frameParse(QList frameList) { @@ -153,9 +138,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/TimeSwitcher.h b/DeviceHub/device/TimeSwitcher.h index 82e900f..73d9cde 100644 --- a/DeviceHub/device/TimeSwitcher.h +++ b/DeviceHub/device/TimeSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/TimeReplicator.h b/DeviceHub/device/TimeReplicator.h index 3d57a76..128c355 100644 --- a/DeviceHub/device/TimeReplicator.h +++ b/DeviceHub/device/TimeReplicator.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeSwitcher.cpp b/DeviceHub/device/TimeSwitcher.cpp index bdeadad..12b23f9 100644 --- a/DeviceHub/device/TimeSwitcher.cpp +++ b/DeviceHub/device/TimeSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "05"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeSwitcher::dataBReceivedHandler); connect(this, &TimeSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->tmSwitForm, &TimeSwitcherForm::drawDeviceFrameOnForm); @@ -58,19 +56,6 @@ dataBuff.clear(); } } -void TimeSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void TimeSwitcher::frameParse(QList frameList) { @@ -153,9 +138,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/TimeSwitcher.h b/DeviceHub/device/TimeSwitcher.h index 82e900f..73d9cde 100644 --- a/DeviceHub/device/TimeSwitcher.h +++ b/DeviceHub/device/TimeSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 048a9c2..1d442d5 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.h +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.h @@ -15,7 +15,7 @@ PHASE_MESSURE_CHANNEL * PHASE_MESSURE_SIZE; static const qulonglong CALCULATE_OFFSET = 0X0080000000000000; -static const double CALCULATE_FACTOR = 1.6810E-15; +static const double CALCULATE_FACTOR = 1.6810E-15 * 1.8; class PhaseProtocolBM : public QObject { diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index 0fcce91..d4f7689 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -39,13 +39,7 @@ open = serial.open(QIODevice::ReadWrite); - std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << std::endl; - -// if (open == true) -// { - -// } - + std::cout << portName.toStdString() << " " << QString::number(baudRate).toStdString() << " " << open << " == " << "parity=" << serial.parity() << std::endl; } void QSerialPortUtil::sendData(QByteArray data) diff --git a/DeviceHub/device/BCodeTerminal.cpp b/DeviceHub/device/BCodeTerminal.cpp index 45bee30..ac1650c 100644 --- a/DeviceHub/device/BCodeTerminal.cpp +++ b/DeviceHub/device/BCodeTerminal.cpp @@ -174,9 +174,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; @@ -192,7 +189,6 @@ } } - // 记录日志 // 0. 输出到日志文件中 QDateTime now = QDateTime::currentDateTime(); diff --git a/DeviceHub/device/DeviceBase.cpp b/DeviceHub/device/DeviceBase.cpp index 8a94d04..65c4dce 100644 --- a/DeviceHub/device/DeviceBase.cpp +++ b/DeviceHub/device/DeviceBase.cpp @@ -79,10 +79,19 @@ void DeviceBase::initSerialPort() { + int master = SettingConfig::getInstance().MASTER; QStringList comNameList = this->comName.split(","); - this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); - if (comNameList.size() == 2) + if (comNameList.isEmpty() == true) { - this->serialUtilB.openSerialPort(comNameList.at(1), this->baudRate); + return; + } + + // 如果是主程序则打开主串口 备程序则打开备串口 + if (master == 1) + { + this->serialUtil.openSerialPort(comNameList.at(0), this->baudRate); + } else + { + this->serialUtil.openSerialPort(comNameList.at(1), this->baudRate); } } diff --git a/DeviceHub/device/DeviceBase.h b/DeviceHub/device/DeviceBase.h index 0a6ef5d..a4dc353 100644 --- a/DeviceHub/device/DeviceBase.h +++ b/DeviceHub/device/DeviceBase.h @@ -48,10 +48,8 @@ QByteArray rawCommandBytes; QSerialPortUtil serialUtil; - QSerialPortUtil serialUtilB; // serial port 2 QKafkaProducer kafkaProducer; QByteArray dataBuff; - QByteArray dataBuffB; }; #endif // DEVICEBASE_H diff --git a/DeviceHub/device/FreqReplicator.cpp b/DeviceHub/device/FreqReplicator.cpp index 6e2dddf..5830c78 100644 --- a/DeviceHub/device/FreqReplicator.cpp +++ b/DeviceHub/device/FreqReplicator.cpp @@ -8,8 +8,6 @@ this->devType = "10"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqReplicator::dataBReceivedHandler); connect(this, &FreqReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqRepForm, &FreqReplicatorForm::drawDeviceFrameOnForm); @@ -50,17 +48,6 @@ } } -void FreqReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} - void FreqReplicator::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) diff --git a/DeviceHub/device/FreqReplicator.h b/DeviceHub/device/FreqReplicator.h index e119917..28eb2d4 100644 --- a/DeviceHub/device/FreqReplicator.h +++ b/DeviceHub/device/FreqReplicator.h @@ -27,7 +27,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); }; #endif // FREQREPLICATOR_H diff --git a/DeviceHub/device/FreqSwitcher.cpp b/DeviceHub/device/FreqSwitcher.cpp index c7ec95f..bd76658 100644 --- a/DeviceHub/device/FreqSwitcher.cpp +++ b/DeviceHub/device/FreqSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "06"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &FreqSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &FreqSwitcher::dataBReceivedHandler); connect(this, &FreqSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->freqSwitForm, &FreqSwitcherForm::drawDeviceFrameOnForm); @@ -59,21 +57,6 @@ } } -void FreqSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} - void FreqSwitcher::frameParse(QList frameList) { for (int i = 0; i < frameList.size(); i++) @@ -156,9 +139,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/FreqSwitcher.h b/DeviceHub/device/FreqSwitcher.h index 57e9971..c48ee94 100644 --- a/DeviceHub/device/FreqSwitcher.h +++ b/DeviceHub/device/FreqSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/NtpServer.cpp b/DeviceHub/device/NtpServer.cpp index c30f351..7185e52 100644 --- a/DeviceHub/device/NtpServer.cpp +++ b/DeviceHub/device/NtpServer.cpp @@ -6,8 +6,6 @@ this->devType = "11"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); connect(this, &NtpServer::sendDataToDraw, ((DeviceHubWindow *)this->parent())->ntpServForm, &NtpServerForm::drawDeviceFrameOnForm); @@ -28,8 +26,6 @@ { disconnect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &NtpServer::dataReceivedHandler); - disconnect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &NtpServer::dataBReceivedHandler); } void NtpServer::mockReceivData() @@ -64,16 +60,6 @@ frameParse(frameList); } } -void NtpServer::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void NtpServer::frameParse(QList frameList) { @@ -180,9 +166,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/NtpServer.h b/DeviceHub/device/NtpServer.h index 09ffa6d..2d851ad 100644 --- a/DeviceHub/device/NtpServer.h +++ b/DeviceHub/device/NtpServer.h @@ -29,7 +29,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/SignalGenerator.cpp b/DeviceHub/device/SignalGenerator.cpp index 1a43418..d8fed40 100644 --- a/DeviceHub/device/SignalGenerator.cpp +++ b/DeviceHub/device/SignalGenerator.cpp @@ -8,8 +8,6 @@ this->devType = "04"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &SignalGenerator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &SignalGenerator::dataBReceivedHandler); connect(this, &SignalGenerator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->signGenForm, &SignalGeneratorForm::drawDeviceFrameOnForm); @@ -60,19 +58,6 @@ dataBuff.clear(); } } -void SignalGenerator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void SignalGenerator::frameParse(QList frameList) { @@ -155,9 +140,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/SignalGenerator.h b/DeviceHub/device/SignalGenerator.h index 613d52a..b51f483 100644 --- a/DeviceHub/device/SignalGenerator.h +++ b/DeviceHub/device/SignalGenerator.h @@ -31,7 +31,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeReplicator.cpp b/DeviceHub/device/TimeReplicator.cpp index 1291335..e3550a2 100644 --- a/DeviceHub/device/TimeReplicator.cpp +++ b/DeviceHub/device/TimeReplicator.cpp @@ -9,8 +9,6 @@ this->devType = "09"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeReplicator::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeReplicator::dataBReceivedHandler); connect(this, &TimeReplicator::sendDataToDraw, ((DeviceHubWindow *)this->parent())->timeRepForm, &TimeReplicatorForm::drawDeviceFrameOnForm); @@ -74,16 +72,6 @@ frameParse(frameList); } } -void TimeReplicator::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } -} void TimeReplicator::frameParse(QList frameList) { @@ -190,9 +178,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { CommandReplyDto replyDto; diff --git a/DeviceHub/device/TimeReplicator.h b/DeviceHub/device/TimeReplicator.h index 3d57a76..128c355 100644 --- a/DeviceHub/device/TimeReplicator.h +++ b/DeviceHub/device/TimeReplicator.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/DeviceHub/device/TimeSwitcher.cpp b/DeviceHub/device/TimeSwitcher.cpp index bdeadad..12b23f9 100644 --- a/DeviceHub/device/TimeSwitcher.cpp +++ b/DeviceHub/device/TimeSwitcher.cpp @@ -8,8 +8,6 @@ this->devType = "05"; connect(&this->serialUtil, &QSerialPortUtil::dataRecieved, this, &TimeSwitcher::dataReceivedHandler); - connect(&this->serialUtilB, &QSerialPortUtil::dataRecieved, - this, &TimeSwitcher::dataBReceivedHandler); connect(this, &TimeSwitcher::sendDataToDraw, ((DeviceHubWindow *)this->parent())->tmSwitForm, &TimeSwitcherForm::drawDeviceFrameOnForm); @@ -58,19 +56,6 @@ dataBuff.clear(); } } -void TimeSwitcher::dataBReceivedHandler(QByteArray data) -{ - this->dataBuffB.append(data); - QList frameListB = protocol->extractFrameList(this->dataBuffB); - if (frameListB.size() > 0) - { - this->dataBuffB.clear(); - frameParse(frameListB); - } else if (dataBuffB.size() > 1024) - { - dataBuffB.clear(); - } -} void TimeSwitcher::frameParse(QList frameList) { @@ -153,9 +138,6 @@ if (serialUtil.isOpen() == true) { this->serialUtil.sendData(data); - } else if (serialUtilB.isOpen() == true) - { - this->serialUtilB.sendData(data); } else { replyDto.cmdStatus = 0; diff --git a/DeviceHub/device/TimeSwitcher.h b/DeviceHub/device/TimeSwitcher.h index 82e900f..73d9cde 100644 --- a/DeviceHub/device/TimeSwitcher.h +++ b/DeviceHub/device/TimeSwitcher.h @@ -30,7 +30,6 @@ public slots: void dataReceivedHandler(QByteArray data); - void dataBReceivedHandler(QByteArray data); void commandReceivedHandler(QJsonObject command); }; diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 048a9c2..1d442d5 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.h +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.h @@ -15,7 +15,7 @@ PHASE_MESSURE_CHANNEL * PHASE_MESSURE_SIZE; static const qulonglong CALCULATE_OFFSET = 0X0080000000000000; -static const double CALCULATE_FACTOR = 1.6810E-15; +static const double CALCULATE_FACTOR = 1.6810E-15 * 1.8; class PhaseProtocolBM : public QObject { diff --git a/ZXSSCJ.pro b/ZXSSCJ.pro index cfcfec9..55d7cd6 100644 --- a/ZXSSCJ.pro +++ b/ZXSSCJ.pro @@ -8,7 +8,7 @@ SUBDIRS += CounterRealTime SUBDIRS += PhaseCompAcq #比相仪数据采集 #SUBDIRS += DevStatusAcq -#SUBDIRS += DeviceHub # +SUBDIRS += DeviceHub # #SUBDIRS += HClockAcq #氢钟状态数据采集 #SUBDIRS += ClockUtils #钟差数据处理小工具