diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp index 1a5e6dd..193d7d2 100644 --- a/DeviceHub/FrequencyTuningForm.cpp +++ b/DeviceHub/FrequencyTuningForm.cpp @@ -31,23 +31,9 @@ { QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString(); - std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl; // 如果不是当前设备的帧,直接返回 if (frameData->devCode != currentDevCode) { - ui->ftDevStatus->setText("-"); - ui->ftInputValid->setText("-"); - ui->ftInputTimeType->setText(""); - ui->ftFreqAdjustAcc->setText(""); - ui->ftPulseAdjustAcc->setText(""); - ui->label_ts->setText("-"); - - ui->ftSynchStatus->setText("-"); - ui->ftRefValid->setText("-"); - ui->ftSecondDiff->setText(""); - ui->ftPhaseShiftAcc->setText(""); - ui->ftPulseWidth->setText(""); - return; } @@ -114,8 +100,3 @@ ui->ftSetPulseWidthRaw->setText(command.value("rawCommand").toString()); } } - -void FrequencyTuningForm::on_ftSetFreqTurnButt_clicked() -{ - -} diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp index 1a5e6dd..193d7d2 100644 --- a/DeviceHub/FrequencyTuningForm.cpp +++ b/DeviceHub/FrequencyTuningForm.cpp @@ -31,23 +31,9 @@ { QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString(); - std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl; // 如果不是当前设备的帧,直接返回 if (frameData->devCode != currentDevCode) { - ui->ftDevStatus->setText("-"); - ui->ftInputValid->setText("-"); - ui->ftInputTimeType->setText(""); - ui->ftFreqAdjustAcc->setText(""); - ui->ftPulseAdjustAcc->setText(""); - ui->label_ts->setText("-"); - - ui->ftSynchStatus->setText("-"); - ui->ftRefValid->setText("-"); - ui->ftSecondDiff->setText(""); - ui->ftPhaseShiftAcc->setText(""); - ui->ftPulseWidth->setText(""); - return; } @@ -114,8 +100,3 @@ ui->ftSetPulseWidthRaw->setText(command.value("rawCommand").toString()); } } - -void FrequencyTuningForm::on_ftSetFreqTurnButt_clicked() -{ - -} diff --git a/DeviceHub/FrequencyTuningForm.h b/DeviceHub/FrequencyTuningForm.h index ab94a2e..14cfad8 100644 --- a/DeviceHub/FrequencyTuningForm.h +++ b/DeviceHub/FrequencyTuningForm.h @@ -23,8 +23,6 @@ private slots: void on_freqTunButt_clicked(); - void on_ftSetFreqTurnButt_clicked(); - private: Ui::FrequencyTuningForm *ui; }; diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp index 1a5e6dd..193d7d2 100644 --- a/DeviceHub/FrequencyTuningForm.cpp +++ b/DeviceHub/FrequencyTuningForm.cpp @@ -31,23 +31,9 @@ { QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString(); - std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl; // 如果不是当前设备的帧,直接返回 if (frameData->devCode != currentDevCode) { - ui->ftDevStatus->setText("-"); - ui->ftInputValid->setText("-"); - ui->ftInputTimeType->setText(""); - ui->ftFreqAdjustAcc->setText(""); - ui->ftPulseAdjustAcc->setText(""); - ui->label_ts->setText("-"); - - ui->ftSynchStatus->setText("-"); - ui->ftRefValid->setText("-"); - ui->ftSecondDiff->setText(""); - ui->ftPhaseShiftAcc->setText(""); - ui->ftPulseWidth->setText(""); - return; } @@ -114,8 +100,3 @@ ui->ftSetPulseWidthRaw->setText(command.value("rawCommand").toString()); } } - -void FrequencyTuningForm::on_ftSetFreqTurnButt_clicked() -{ - -} diff --git a/DeviceHub/FrequencyTuningForm.h b/DeviceHub/FrequencyTuningForm.h index ab94a2e..14cfad8 100644 --- a/DeviceHub/FrequencyTuningForm.h +++ b/DeviceHub/FrequencyTuningForm.h @@ -23,8 +23,6 @@ private slots: void on_freqTunButt_clicked(); - void on_ftSetFreqTurnButt_clicked(); - private: Ui::FrequencyTuningForm *ui; }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index faa4cfa..0fcce91 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -60,7 +60,6 @@ void QSerialPortUtil::readData() { QByteArray buffer = serial.readAll(); - std::cout << "[recv]" << buffer.toStdString() << std::endl; emit dataRecieved(buffer); } diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp index 1a5e6dd..193d7d2 100644 --- a/DeviceHub/FrequencyTuningForm.cpp +++ b/DeviceHub/FrequencyTuningForm.cpp @@ -31,23 +31,9 @@ { QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString(); - std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl; // 如果不是当前设备的帧,直接返回 if (frameData->devCode != currentDevCode) { - ui->ftDevStatus->setText("-"); - ui->ftInputValid->setText("-"); - ui->ftInputTimeType->setText(""); - ui->ftFreqAdjustAcc->setText(""); - ui->ftPulseAdjustAcc->setText(""); - ui->label_ts->setText("-"); - - ui->ftSynchStatus->setText("-"); - ui->ftRefValid->setText("-"); - ui->ftSecondDiff->setText(""); - ui->ftPhaseShiftAcc->setText(""); - ui->ftPulseWidth->setText(""); - return; } @@ -114,8 +100,3 @@ ui->ftSetPulseWidthRaw->setText(command.value("rawCommand").toString()); } } - -void FrequencyTuningForm::on_ftSetFreqTurnButt_clicked() -{ - -} diff --git a/DeviceHub/FrequencyTuningForm.h b/DeviceHub/FrequencyTuningForm.h index ab94a2e..14cfad8 100644 --- a/DeviceHub/FrequencyTuningForm.h +++ b/DeviceHub/FrequencyTuningForm.h @@ -23,8 +23,6 @@ private slots: void on_freqTunButt_clicked(); - void on_ftSetFreqTurnButt_clicked(); - private: Ui::FrequencyTuningForm *ui; }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index faa4cfa..0fcce91 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -60,7 +60,6 @@ void QSerialPortUtil::readData() { QByteArray buffer = serial.readAll(); - std::cout << "[recv]" << buffer.toStdString() << std::endl; emit dataRecieved(buffer); } diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp index bf54b94..d836753 100644 --- a/DeviceHub/device/FrequencyTuning.cpp +++ b/DeviceHub/device/FrequencyTuning.cpp @@ -16,12 +16,12 @@ connect(this, &FrequencyTuning::sendCommandToDisplay, ((DeviceHubWindow *)this->parent())->freqTunForm, &FrequencyTuningForm::displayDeviceCommandOnForm); -// connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved, -// this, &FrequencyTuning::commandReceivedHandler); + connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved, + this, &FrequencyTuning::commandReceivedHandler); -// kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaProducer.createProducer(); + kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaProducer.createProducer(); this->protocol = DeviceProtocolBase::deviceProtocolFactory(devType); } @@ -100,8 +100,8 @@ } void FrequencyTuning::afterFrameParse(DeviceFrameBaseDto * frameDto) { - std::cout << "frame type: " << typeid(* frameDto).name() << std::endl; - std::cout << frameDto->rawFrame.toStdString() << std::endl; +// std::cout << "frame type: " << typeid(* frameDto).name() << std::endl; +// std::cout << frameDto->rawFrame.toStdString() << std::endl; // 0. 输出到日志文件中 QString date = frameDto->timestamp.mid(0, 10); @@ -122,7 +122,7 @@ QJsonObject jsonObj = frameDto->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 @@ -153,8 +153,8 @@ // 3. 输出到中间件,执行后续处理过程 if (SettingConfig::getInstance().NEED_KAFKA == 1) { -// kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, -// QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, + QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); } return; } @@ -181,8 +181,8 @@ // 3. 输出到中间件,执行后续处理过程 if (SettingConfig::getInstance().NEED_KAFKA == 1) { -// kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, -// QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, + QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); } std::cout << content.toStdString() << std::endl; diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp index 453cb10..97c6e6d 100644 --- a/CounterAcq/CounterDevice.cpp +++ b/CounterAcq/CounterDevice.cpp @@ -101,6 +101,10 @@ // 2. 各个通道的clock diff数据 for (int i = 1; i <= counterData->channelActiveArray.size(); i++) { + if (counterData->channelRefId == i) + { + continue; + } if (counterData->channelActiveArray.at(i-1).toUInt() == 1) { QString chFilename("%1_CH_%2.log"); diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp index 1a5e6dd..193d7d2 100644 --- a/DeviceHub/FrequencyTuningForm.cpp +++ b/DeviceHub/FrequencyTuningForm.cpp @@ -31,23 +31,9 @@ { QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString(); - std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl; // 如果不是当前设备的帧,直接返回 if (frameData->devCode != currentDevCode) { - ui->ftDevStatus->setText("-"); - ui->ftInputValid->setText("-"); - ui->ftInputTimeType->setText(""); - ui->ftFreqAdjustAcc->setText(""); - ui->ftPulseAdjustAcc->setText(""); - ui->label_ts->setText("-"); - - ui->ftSynchStatus->setText("-"); - ui->ftRefValid->setText("-"); - ui->ftSecondDiff->setText(""); - ui->ftPhaseShiftAcc->setText(""); - ui->ftPulseWidth->setText(""); - return; } @@ -114,8 +100,3 @@ ui->ftSetPulseWidthRaw->setText(command.value("rawCommand").toString()); } } - -void FrequencyTuningForm::on_ftSetFreqTurnButt_clicked() -{ - -} diff --git a/DeviceHub/FrequencyTuningForm.h b/DeviceHub/FrequencyTuningForm.h index ab94a2e..14cfad8 100644 --- a/DeviceHub/FrequencyTuningForm.h +++ b/DeviceHub/FrequencyTuningForm.h @@ -23,8 +23,6 @@ private slots: void on_freqTunButt_clicked(); - void on_ftSetFreqTurnButt_clicked(); - private: Ui::FrequencyTuningForm *ui; }; diff --git a/DeviceHub/common/utils/QSerialPortUtil.cpp b/DeviceHub/common/utils/QSerialPortUtil.cpp index faa4cfa..0fcce91 100644 --- a/DeviceHub/common/utils/QSerialPortUtil.cpp +++ b/DeviceHub/common/utils/QSerialPortUtil.cpp @@ -60,7 +60,6 @@ void QSerialPortUtil::readData() { QByteArray buffer = serial.readAll(); - std::cout << "[recv]" << buffer.toStdString() << std::endl; emit dataRecieved(buffer); } diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp index bf54b94..d836753 100644 --- a/DeviceHub/device/FrequencyTuning.cpp +++ b/DeviceHub/device/FrequencyTuning.cpp @@ -16,12 +16,12 @@ connect(this, &FrequencyTuning::sendCommandToDisplay, ((DeviceHubWindow *)this->parent())->freqTunForm, &FrequencyTuningForm::displayDeviceCommandOnForm); -// connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved, -// this, &FrequencyTuning::commandReceivedHandler); + connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved, + this, &FrequencyTuning::commandReceivedHandler); -// kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); -// kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); -// kafkaProducer.createProducer(); + kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS); + kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC); + kafkaProducer.createProducer(); this->protocol = DeviceProtocolBase::deviceProtocolFactory(devType); } @@ -100,8 +100,8 @@ } void FrequencyTuning::afterFrameParse(DeviceFrameBaseDto * frameDto) { - std::cout << "frame type: " << typeid(* frameDto).name() << std::endl; - std::cout << frameDto->rawFrame.toStdString() << std::endl; +// std::cout << "frame type: " << typeid(* frameDto).name() << std::endl; +// std::cout << frameDto->rawFrame.toStdString() << std::endl; // 0. 输出到日志文件中 QString date = frameDto->timestamp.mid(0, 10); @@ -122,7 +122,7 @@ QJsonObject jsonObj = frameDto->toJSON(); jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID); jsonObj.insert("deviceId", deviceId); -// kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact))); } // 4. 在界面上简单显示相差数据结果 @@ -153,8 +153,8 @@ // 3. 输出到中间件,执行后续处理过程 if (SettingConfig::getInstance().NEED_KAFKA == 1) { -// kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, -// QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, + QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); } return; } @@ -181,8 +181,8 @@ // 3. 输出到中间件,执行后续处理过程 if (SettingConfig::getInstance().NEED_KAFKA == 1) { -// kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, -// QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); + kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC, + QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact))); } std::cout << content.toStdString() << std::endl; diff --git a/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp b/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp index 9a1bf9f..44a8cf8 100644 --- a/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp +++ b/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp @@ -69,27 +69,12 @@ { QList resultList; -// int start = rawData.indexOf("$GL"); -// if (start < 0) -// { -// return resultList; -// } -// int end = rawData.indexOf(QByteArray("\r\n"), start); -// if (end < 0) -// { -// return resultList; -// } - -// while (start >= 0 & end >= 0) -// { -// QByteArray ba = rawData.mid(start, end - start + 2); -// resultList.append(ba); - -// rawData = rawData.right(end); - -// start = rawData.indexOf("$GL"); -// end = rawData.indexOf(QByteArray("\r\n"), start); -// } + int start = rawData.indexOf("$GL"); + if (start < 0) + { + return resultList; + } + rawData = rawData.right(rawData.size() - start); if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true) {