diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h index c95e1a3..fb4f22b 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h @@ -1,19 +1,23 @@ -#ifndef SIGNALGENERATORMJDTIMEDTO_H +#ifndef SIGNALGENERATORMJDTIMEDTO_H #define SIGNALGENERATORMJDTIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorMJDTimeDto class + * 信号产生器 MJD时间信息 + */ class SignalGeneratorMJDTimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorMJDTimeDto(QObject *parent = nullptr); - QString mjdTime; // <1> - QString mjdDay; // <2> - QString leapSec; // <3> - QString valid; // <4> + QString mjdTime; // <1> 时分秒 + QString mjdDay; // <2> 儒略日 + QString leapSec; // <3> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <4> 有效标志：01=有效；00=无效 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h index c95e1a3..fb4f22b 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h @@ -1,19 +1,23 @@ -#ifndef SIGNALGENERATORMJDTIMEDTO_H +#ifndef SIGNALGENERATORMJDTIMEDTO_H #define SIGNALGENERATORMJDTIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorMJDTimeDto class + * 信号产生器 MJD时间信息 + */ class SignalGeneratorMJDTimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorMJDTimeDto(QObject *parent = nullptr); - QString mjdTime; // <1> - QString mjdDay; // <2> - QString leapSec; // <3> - QString valid; // <4> + QString mjdTime; // <1> 时分秒 + QString mjdDay; // <2> 儒略日 + QString leapSec; // <3> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <4> 有效标志：01=有效；00=无效 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp index 1113584..2ef1c14 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorStatusDto.h" +#include "SignalGeneratorStatusDto.h" SignalGeneratorStatusDto::SignalGeneratorStatusDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -23,6 +23,7 @@ dataObj.insert("bacRange", bacRange); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h index c95e1a3..fb4f22b 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h @@ -1,19 +1,23 @@ -#ifndef SIGNALGENERATORMJDTIMEDTO_H +#ifndef SIGNALGENERATORMJDTIMEDTO_H #define SIGNALGENERATORMJDTIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorMJDTimeDto class + * 信号产生器 MJD时间信息 + */ class SignalGeneratorMJDTimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorMJDTimeDto(QObject *parent = nullptr); - QString mjdTime; // <1> - QString mjdDay; // <2> - QString leapSec; // <3> - QString valid; // <4> + QString mjdTime; // <1> 时分秒 + QString mjdDay; // <2> 儒略日 + QString leapSec; // <3> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <4> 有效标志：01=有效；00=无效 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp index 1113584..2ef1c14 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorStatusDto.h" +#include "SignalGeneratorStatusDto.h" SignalGeneratorStatusDto::SignalGeneratorStatusDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -23,6 +23,7 @@ dataObj.insert("bacRange", bacRange); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h index 1c6d005..53a8186 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h @@ -1,26 +1,30 @@ -#ifndef SIGNALGENERATORSTATUSDTO_H +#ifndef SIGNALGENERATORSTATUSDTO_H #define SIGNALGENERATORSTATUSDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorStatusDto class + * 信号产生器 工作状态信息 + */ class SignalGeneratorStatusDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorStatusDto(QObject *parent = nullptr); - QString devStatus; // <1> - QString leapSec; // <2> - QString leapTimestamp; // <3> - QString freqSignalStatus; // <4> - QString freqSignalType; // <5> - QString oppsSignalStatus; // <6> - qlonglong phaseDiff; // <7> - qlonglong pulseWidth; // <8> - qlonglong phaseShiftAcc; // <9> - qint8 bacRatio; // <10> - float bacRange; // <11> + QString devStatus; // <1> 设备工作状态 + QString leapSec; // <2> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString leapTimestamp; // <3> 闰秒时刻，只精准至日 + QString freqSignalStatus; // <4> 频率信号状态：0：无效，1：有效； + QString freqSignalType; // <5> 频率信号类别：0：10MHz，1：5MHz； + QString oppsSignalStatus; // <6> 1PPS信号状态：0：无效，1：有效； + qlonglong phaseDiff; // <7> 输入1PPS与本地输出1PPS的相差，单位为1ns，带小数点后两位 + qlonglong pulseWidth; // <8> 1PPS脉宽，10000~500000000，单位为ns + qlonglong phaseShiftAcc; // <9> 1PPS移相量，单位1ps + qint8 bacRatio; // <10> B-AC调制比，2~6 + float bacRange; // <11> B-AC幅度，5表示0.5V，50表示5.0V，100表示10V QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h index c95e1a3..fb4f22b 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h @@ -1,19 +1,23 @@ -#ifndef SIGNALGENERATORMJDTIMEDTO_H +#ifndef SIGNALGENERATORMJDTIMEDTO_H #define SIGNALGENERATORMJDTIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorMJDTimeDto class + * 信号产生器 MJD时间信息 + */ class SignalGeneratorMJDTimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorMJDTimeDto(QObject *parent = nullptr); - QString mjdTime; // <1> - QString mjdDay; // <2> - QString leapSec; // <3> - QString valid; // <4> + QString mjdTime; // <1> 时分秒 + QString mjdDay; // <2> 儒略日 + QString leapSec; // <3> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <4> 有效标志：01=有效；00=无效 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp index 1113584..2ef1c14 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorStatusDto.h" +#include "SignalGeneratorStatusDto.h" SignalGeneratorStatusDto::SignalGeneratorStatusDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -23,6 +23,7 @@ dataObj.insert("bacRange", bacRange); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h index 1c6d005..53a8186 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h @@ -1,26 +1,30 @@ -#ifndef SIGNALGENERATORSTATUSDTO_H +#ifndef SIGNALGENERATORSTATUSDTO_H #define SIGNALGENERATORSTATUSDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorStatusDto class + * 信号产生器 工作状态信息 + */ class SignalGeneratorStatusDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorStatusDto(QObject *parent = nullptr); - QString devStatus; // <1> - QString leapSec; // <2> - QString leapTimestamp; // <3> - QString freqSignalStatus; // <4> - QString freqSignalType; // <5> - QString oppsSignalStatus; // <6> - qlonglong phaseDiff; // <7> - qlonglong pulseWidth; // <8> - qlonglong phaseShiftAcc; // <9> - qint8 bacRatio; // <10> - float bacRange; // <11> + QString devStatus; // <1> 设备工作状态 + QString leapSec; // <2> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString leapTimestamp; // <3> 闰秒时刻，只精准至日 + QString freqSignalStatus; // <4> 频率信号状态：0：无效，1：有效； + QString freqSignalType; // <5> 频率信号类别：0：10MHz，1：5MHz； + QString oppsSignalStatus; // <6> 1PPS信号状态：0：无效，1：有效； + qlonglong phaseDiff; // <7> 输入1PPS与本地输出1PPS的相差，单位为1ns，带小数点后两位 + qlonglong pulseWidth; // <8> 1PPS脉宽，10000~500000000，单位为ns + qlonglong phaseShiftAcc; // <9> 1PPS移相量，单位1ps + qint8 bacRatio; // <10> B-AC调制比，2~6 + float bacRange; // <11> B-AC幅度，5表示0.5V，50表示5.0V，100表示10V QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp index 231977f..ab06c2e 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorZDATimeDto.h" +#include "SignalGeneratorZDATimeDto.h" SignalGeneratorZDATimeDto::SignalGeneratorZDATimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -18,6 +18,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp index d8067df..5883aca 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningProtocolBM.h" +#include "FrequencyTuningProtocolBM.h" FrequencyTuningProtocolBM::FrequencyTuningProtocolBM(QObject *parent) : QObject(parent) { @@ -48,6 +48,7 @@ ((FrequencyTuningStatusFreqDto *)ftFrameData)->devStatus = subList.at(23); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputTimeType = subList.at(24); ((FrequencyTuningStatusFreqDto *)ftFrameData)->inputValid = subList.at(25); + ((FrequencyTuningStatusFreqDto *)ftFrameData)->frameType = FREQUENCY_TUNING_FREQ_FRAME_TYPE; break; case FrequencyTuningProtocolBM::FREQUENCY_TUNING_FRAME_TYPE::PULSE_FRAME : @@ -57,6 +58,7 @@ ((FrequencyTuningStatusPulseDto *)ftFrameData)->refValid = subList.at(2); ((FrequencyTuningStatusPulseDto *)ftFrameData)->phaseShiftAcc = subList.at(3).toLongLong(); ((FrequencyTuningStatusPulseDto *)ftFrameData)->pulseWidth = subList.at(4).toLongLong(); + ((FrequencyTuningStatusPulseDto *)ftFrameData)->frameType = FREQUENCY_TUNING_PULSE_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h index 59217db..2cc3545 100644 --- a/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h +++ b/DevStatusAcq/protocol/FrequencyTuningProtocolBM.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGPROTOCOLBM_H +#ifndef FREQUENCYTUNINGPROTOCOLBM_H #define FREQUENCYTUNINGPROTOCOLBM_H #include @@ -27,6 +27,9 @@ FREQUENCY_TUNING_PULSE_FRAME_SUB_COUNT * FREQUENCY_TUNING_FRAME_SUB_MIN_SIZE + 1 + FREQUENCY_TUNING_FRAME_SUM_LENGTH; +static const QString FREQUENCY_TUNING_FREQ_FRAME_TYPE = "0301"; +static const QString FREQUENCY_TUNING_PULSE_FRAME_TYPE = "0302"; + class FrequencyTuningProtocolBM : public QObject { Q_OBJECT diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp index 51fe0ae..6d8efc1 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.cpp @@ -54,6 +54,7 @@ ((SignalGeneratorInterfaceDto *)sgFrameData)->keyControl = subList.at(0); ((SignalGeneratorInterfaceDto *)sgFrameData)->timeType = subList.at(1); + ((SignalGeneratorInterfaceDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::STATUS_FRAME : @@ -69,6 +70,7 @@ ((SignalGeneratorStatusDto *)sgFrameData)->phaseShiftAcc = subList.at(8).toLongLong(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRatio = subList.at(9).toUInt(); ((SignalGeneratorStatusDto *)sgFrameData)->bacRange = subList.at(10).toFloat(); + ((SignalGeneratorStatusDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_STATUS_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::ZDA_FRAME : @@ -79,6 +81,7 @@ ((SignalGeneratorZDATimeDto *)sgFrameData)->zdaYear = subList.at(3); ((SignalGeneratorZDATimeDto *)sgFrameData)->leapSec = subList.at(4); ((SignalGeneratorZDATimeDto *)sgFrameData)->valid = subList.at(5); + ((SignalGeneratorZDATimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_ZDA_FRAME_TYPE; break; case SignalGeneratorProtocolBM::SIGNAL_GENERATOR_FRAME_TYPE::MJD_FRAME : @@ -87,6 +90,7 @@ ((SignalGeneratorMJDTimeDto *)sgFrameData)->mjdDay = subList.at(1); ((SignalGeneratorMJDTimeDto *)sgFrameData)->leapSec = subList.at(2); ((SignalGeneratorMJDTimeDto *)sgFrameData)->valid = subList.at(3); + ((SignalGeneratorMJDTimeDto *)sgFrameData)->frameType = SIGNAL_GENERATOR_MJD_FRAME_TYPE; break; } diff --git a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h index 7e4a6b7..1519872 100644 --- a/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h +++ b/DevStatusAcq/protocol/SignalGeneratorProtocolBM.h @@ -41,6 +41,11 @@ SIGNAL_GENERATOR_MJD_FRAME_SUB_COUNT * SIGNAL_GENERATOR_FRAME_SUB_MIN_SIZE + 1 + SIGNAL_GENERATOR_FRAME_SUM_LENGTH; +static const QString SIGNAL_GENERATOR_INTERFACE_FRAME_TYPE = "0401"; +static const QString SIGNAL_GENERATOR_STATUS_FRAME_TYPE = "0402"; +static const QString SIGNAL_GENERATOR_MJD_FRAME_TYPE = "0403"; +static const QString SIGNAL_GENERATOR_ZDA_FRAME_TYPE = "0404"; + class SignalGeneratorProtocolBM : public QObject { public: diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h index 205bad2..55b3080 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusDto.h @@ -1,4 +1,4 @@ -#ifndef FREQUENCYTUNINGSTATUSDTO_H +#ifndef FREQUENCYTUNINGSTATUSDTO_H #define FREQUENCYTUNINGSTATUSDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp index 9db6c45..b7da15d 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusFreqDto.h" +#include "FrequencyTuningStatusFreqDto.h" FrequencyTuningStatusFreqDto::FrequencyTuningStatusFreqDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseAdjustAcc", pulseAdjustAcc); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h index b5a7d41..d30ffad 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusFreqDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H +#ifndef FREQUENCYTUNINGSTATUSFREQDTO_H #define FREQUENCYTUNINGSTATUSFREQDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusFreqDto class + * 频率微调设备工作状态：频率输出状态 + */ class FrequencyTuningStatusFreqDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusFreqDto(QObject *parent = nullptr); - QString devStatus; // <24> - QString inputTimeType; // <25> - QString inputValid; // <26> - qlonglong freqAdjustAcc; // <17> - qlonglong pulseAdjustAcc; // <18> + QString devStatus; // <24> 设备工作状态：1=正常；0=异常 + QString inputTimeType; // <25> 输入时钟类别：1=5MHz；0=10MHz + QString inputValid; // <26> 输入有效性：1=有效；0=无效 + qlonglong freqAdjustAcc; // <17> 频率调整累计值，单位1pHz + qlonglong pulseAdjustAcc; // <18> 相位调整累计值，单位0.1fs QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp index 52d032c..364e200 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.cpp @@ -1,4 +1,4 @@ -#include "FrequencyTuningStatusPulseDto.h" +#include "FrequencyTuningStatusPulseDto.h" FrequencyTuningStatusPulseDto::FrequencyTuningStatusPulseDto(QObject *parent) : FrequencyTuningStatusDto(parent) { @@ -17,6 +17,7 @@ dataObj.insert("pulseWidth", pulseWidth); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h index 372e594..acd8867 100644 --- a/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h +++ b/DevStatusAcq/protocol/dto/FrequencyTuningStatusPulseDto.h @@ -1,20 +1,24 @@ -#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H +#ifndef FREQUENCYTUNINGSTATUSPULSEDTO_H #define FREQUENCYTUNINGSTATUSPULSEDTO_H #include #include "protocol/dto/FrequencyTuningStatusDto.h" +/** + * @brief The FrequencyTuningStatusPulseDto class + * 频率微调设备工作状态：秒脉冲状态 + */ class FrequencyTuningStatusPulseDto : public FrequencyTuningStatusDto { Q_OBJECT public: explicit FrequencyTuningStatusPulseDto(QObject *parent = nullptr); - QString synchStatus; // <1> - qlonglong secondDiff; // <2> - QString refValid; // <3> - qlonglong phaseShiftAcc; // <4> - qlonglong pulseWidth; // <5> + QString synchStatus; // <1> 同步状态：1=正常；0=异常 + qlonglong secondDiff; // <2> 秒差，单位1ns，范围-500ms~500ms + QString refValid; // <3> 参考有效：1=有效；0=无效 + qlonglong phaseShiftAcc; // <4> 移相累计值，单位1ps，范围-500ms~500ms + qlonglong pulseWidth; // <5> 移脉宽，单位1ns，范围10us~500ms QJsonObject toJSON(); }; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h index 504f410..068f0b1 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorFrameDto.h @@ -1,4 +1,4 @@ -#ifndef SIGNALGENERATORFRAMEDTO_H +#ifndef SIGNALGENERATORFRAMEDTO_H #define SIGNALGENERATORFRAMEDTO_H #include @@ -16,6 +16,7 @@ QString timestamp; // 时间戳字符串 qlonglong milisecond; // 毫秒计数 QString devCode; + QString frameType; // 帧类型 virtual QJsonObject toJSON() = 0; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp index 68e4204..d958555 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorInterfaceDto.h" +#include "SignalGeneratorInterfaceDto.h" SignalGeneratorInterfaceDto::SignalGeneratorInterfaceDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -14,6 +14,7 @@ dataObj.insert("timeType", timeType); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h index 2ea4653..3316398 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorInterfaceDto.h @@ -1,17 +1,21 @@ -#ifndef SIGNALGENERATORINTERFACEDTO_H +#ifndef SIGNALGENERATORINTERFACEDTO_H #define SIGNALGENERATORINTERFACEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorInterfaceDto class + * 信号产生器 界面状态信息 + */ class SignalGeneratorInterfaceDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorInterfaceDto(QObject *parent = nullptr); - QString keyControl; // - QString timeType; // + QString keyControl; // <1>键盘控制情况：1=锁定；0=解锁 + QString timeType; // <2>时间显示类别：1=儒略日；0=年月日 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp index 61c9289..b2c2acf 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorMJDTimeDto.h" +#include "SignalGeneratorMJDTimeDto.h" SignalGeneratorMJDTimeDto::SignalGeneratorMJDTimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -16,6 +16,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h index c95e1a3..fb4f22b 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorMJDTimeDto.h @@ -1,19 +1,23 @@ -#ifndef SIGNALGENERATORMJDTIMEDTO_H +#ifndef SIGNALGENERATORMJDTIMEDTO_H #define SIGNALGENERATORMJDTIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorMJDTimeDto class + * 信号产生器 MJD时间信息 + */ class SignalGeneratorMJDTimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorMJDTimeDto(QObject *parent = nullptr); - QString mjdTime; // <1> - QString mjdDay; // <2> - QString leapSec; // <3> - QString valid; // <4> + QString mjdTime; // <1> 时分秒 + QString mjdDay; // <2> 儒略日 + QString leapSec; // <3> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <4> 有效标志：01=有效；00=无效 QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp index 1113584..2ef1c14 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorStatusDto.h" +#include "SignalGeneratorStatusDto.h" SignalGeneratorStatusDto::SignalGeneratorStatusDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -23,6 +23,7 @@ dataObj.insert("bacRange", bacRange); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h index 1c6d005..53a8186 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorStatusDto.h @@ -1,26 +1,30 @@ -#ifndef SIGNALGENERATORSTATUSDTO_H +#ifndef SIGNALGENERATORSTATUSDTO_H #define SIGNALGENERATORSTATUSDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorStatusDto class + * 信号产生器 工作状态信息 + */ class SignalGeneratorStatusDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorStatusDto(QObject *parent = nullptr); - QString devStatus; // <1> - QString leapSec; // <2> - QString leapTimestamp; // <3> - QString freqSignalStatus; // <4> - QString freqSignalType; // <5> - QString oppsSignalStatus; // <6> - qlonglong phaseDiff; // <7> - qlonglong pulseWidth; // <8> - qlonglong phaseShiftAcc; // <9> - qint8 bacRatio; // <10> - float bacRange; // <11> + QString devStatus; // <1> 设备工作状态 + QString leapSec; // <2> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString leapTimestamp; // <3> 闰秒时刻，只精准至日 + QString freqSignalStatus; // <4> 频率信号状态：0：无效，1：有效； + QString freqSignalType; // <5> 频率信号类别：0：10MHz，1：5MHz； + QString oppsSignalStatus; // <6> 1PPS信号状态：0：无效，1：有效； + qlonglong phaseDiff; // <7> 输入1PPS与本地输出1PPS的相差，单位为1ns，带小数点后两位 + qlonglong pulseWidth; // <8> 1PPS脉宽，10000~500000000，单位为ns + qlonglong phaseShiftAcc; // <9> 1PPS移相量，单位1ps + qint8 bacRatio; // <10> B-AC调制比，2~6 + float bacRange; // <11> B-AC幅度，5表示0.5V，50表示5.0V，100表示10V QJsonObject toJSON(); diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp index 231977f..ab06c2e 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp +++ b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.cpp @@ -1,4 +1,4 @@ -#include "SignalGeneratorZDATimeDto.h" +#include "SignalGeneratorZDATimeDto.h" SignalGeneratorZDATimeDto::SignalGeneratorZDATimeDto(QObject *parent) : SignalGeneratorFrameDto(parent) { @@ -18,6 +18,7 @@ dataObj.insert("valid", valid); jsonObj.insert("ts", this->milisecond); + jsonObj.insert("frameType", this->frameType); jsonObj.insert("data", dataObj); return jsonObj; diff --git a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.h b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.h index d3f145a..8e762a8 100644 --- a/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.h +++ b/DevStatusAcq/protocol/dto/SignalGeneratorZDATimeDto.h @@ -1,21 +1,25 @@ -#ifndef SIGNALGENERATORZDATIMEDTO_H +#ifndef SIGNALGENERATORZDATIMEDTO_H #define SIGNALGENERATORZDATIMEDTO_H #include #include "protocol/dto/SignalGeneratorFrameDto.h" +/** + * @brief The SignalGeneratorZDATimeDto class + * 信号产生器 ZDA时间信息 + */ class SignalGeneratorZDATimeDto : public SignalGeneratorFrameDto { Q_OBJECT public: explicit SignalGeneratorZDATimeDto(QObject *parent = nullptr); - QString zdaTime; // <1> - QString zdaDay; // <2> - QString zdaMon; // <3> - QString zdaYear; // <4> - QString leapSec; // <5> - QString valid; // <6> + QString zdaTime; // <1> 时分秒 + QString zdaDay; // <2> 日期 + QString zdaMon; // <3> 月 + QString zdaYear; // <4> 年 + QString leapSec; // <5> 闰秒标志：0=无闰秒；1=正闰秒；2=负闰秒 + QString valid; // <6> 有效标志：01=有效；00=无效 QJsonObject toJSON();