Index: main.cpp =================================================================== diff -u -ra6586ea871f21a08e7d50552983360fb5e344b3a -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- main.cpp (.../main.cpp) (revision a6586ea871f21a08e7d50552983360fb5e344b3a) +++ main.cpp (.../main.cpp) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -211,44 +211,55 @@ parser.addOption(optionDisableTimeout); // --- -a : disable-alarm-no-minimize - QCommandLineOption optionDisableAlarmMoMinimize(QStringList() << "a" << "disable-alarm-no-minimize", - QCoreApplication::translate("main", "Disables alarm no minimize")); + QCommandLineOption optionDisableAlarmMoMinimize( + QStringList() << "a" << "disable-alarm-no-minimize", + QCoreApplication::translate("main", "Disables alarm no minimize")); parser.addOption(optionDisableAlarmMoMinimize); // --- -S : disable-sd-card-fail-log-stop - QCommandLineOption optionDisableSDCardFailLogStop(QStringList() << "S" << "disable-sd-card-fail-log-stop", - QCoreApplication::translate("main", "disable-sd-card-fail-log-stop")); + QCommandLineOption optionDisableSDCardFailLogStop( + QStringList() << "S" << "disable-sd-card-fail-log-stop", + QCoreApplication::translate("main", "disable-sd-card-fail-log-stop")); parser.addOption(optionDisableSDCardFailLogStop); // --- -C : disable-cloudsync-fail-stop - QCommandLineOption optionDisableCloudSyncFailStop(QStringList() << "C" << "disable-cloudsync-fail-stop", - QCoreApplication::translate("main", "disable-cloudsync-fail-stop")); + QCommandLineOption optionDisableCloudSyncFailStop( + QStringList() << "C" << "disable-cloudsync-fail-stop", + QCoreApplication::translate("main", "disable-cloudsync-fail-stop")); parser.addOption(optionDisableCloudSyncFailStop); // --- -k : enable-Check-in-log (keep-alive) - QCommandLineOption optionEnableCheckInLog(QStringList() << "k" << "enable-check-in-log", - QCoreApplication::translate("main", "Enables Check-In Log")); + QCommandLineOption optionEnableCheckInLog( + QStringList() << "k" << "enable-check-in-log", + QCoreApplication::translate("main", "Enables Check-In Log")); parser.addOption(optionEnableCheckInLog); // --- -K : enable-acknow-log (Acknowledge) - QCommandLineOption optionEnableAcknowLog(QStringList() << "K" << "enable-acknow-log", - QCoreApplication::translate("main", "Enables Acknowledgment Log")); + QCommandLineOption optionEnableAcknowLog( + QStringList() << "K" << "enable-acknow-log", + QCoreApplication::translate("main", "Enables Acknowledgment Log")); parser.addOption(optionEnableAcknowLog); // --- -D : enable-dry-demo - QCommandLineOption optionEnableDryDemo(QStringList() << "D" << "enable-dry-demo", - QCoreApplication::translate("main", "Enables Dry-Demo Mode")); + QCommandLineOption optionEnableDryDemo( + QStringList() << "D" << "enable-dry-demo", + QCoreApplication::translate("main", "Enables Dry-Demo Mode")); parser.addOption(optionEnableDryDemo); // --- -A : active-can-bus - QCommandLineOption optionActiveCANBus(QStringList() << "A" << "active-can-bus", - QCoreApplication::translate("main", "Sets the Active CANBus [Shall start with 'can' or 'vcan]"), - QCoreApplication::translate("main", "CANBus")); + QCommandLineOption optionActiveCANBus( + QStringList() << "A" << "active-can-bus", + QCoreApplication::translate("main", "Sets the Active CANBus [Shall start with 'can' or 'vcan]"), + QCoreApplication::translate("main", "CANBus")); parser.addOption(optionActiveCANBus); // --- parse command lines - parser.process(*qApp); + parser.parse(qApp->arguments()); + + qDebug() << parser.unknownOptionNames(); + qDebug() << parser.optionNames(); + gConsoleoutCanInterface = parser.isSet(optionConsoleoutCanInterface ); gConsoleoutFrameInterface = parser.isSet(optionConsoleoutFrameInterface ); gConsoleoutLogs = parser.isSet(optionConsoleoutLogs ); Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r111520b86cdf85fca12c577ef492d8528c741044 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -108,7 +108,7 @@ // List of the transmit(request) only, messages which require acknowledge back(AckBack). QList _needsAcknow { // FIXME: check this on device first. It is not working with dialin. -// GuiActionType::ID_KeepAlive , + GuiActionType::ID_KeepAlive , // CONFIRM GuiActionType::ID_DuetConfirmUIr , // POST Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r111520b86cdf85fca12c577ef492d8528c741044 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 111520b86cdf85fca12c577ef492d8528c741044) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -96,7 +96,7 @@ {Gui::GuiActionType::ID_DGDrainPumpData , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 15 * 4 }, // 15 parameters each 4bytes - {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes + {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 21 * 4 }, // 21 parameters each 4bytes Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -27,8 +27,10 @@ property var model: [] property var label: [] property string title: "Title" - property int fontPixelSizeTitle: 30 - property int fontPixelSizeText : 35 + property int fontPixelSizeTitle: Fonts.fontPixelDebugTitle + property int fontPixelSizeText : Fonts.fontPixelDebugText + property int fontPixelSizeLabel: Fonts.fontPixelDebugLabel + property string textObjectName: "_DebugDataColumn" property int horizontalAlignmentTitle: Text.AlignRight @@ -45,6 +47,7 @@ font.pixelSize: fontPixelSizeTitle font.underline: true bottomPadding: 5 + font.family: Fonts.fontFamilyDebug } Repeater { id: _repeater model: _root.model @@ -55,14 +58,17 @@ horizontalAlignment: _root.horizontalAlignmentText color: Colors.textMain font.pixelSize: fontPixelSizeText + font.family: Fonts.fontFamilyDebug + Text { objectName : _root.textObjectName + "L" + index text : (index < _root.label.length) ? _root.label[index] : "" color : Colors.textMain - font.pixelSize : 15 + font.pixelSize : fontPixelSizeLabel anchors.baseline: parent.baseline anchors.left : parent.right horizontalAlignment: Text.AlignLeft + font.family: Fonts.fontFamilyDebug } } } Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r5349652d6b046b37f9ac0fc6577953413815deeb -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5349652d6b046b37f9ac0fc6577953413815deeb) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -292,7 +292,7 @@ model: [ vDGOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- @@ -437,7 +437,7 @@ model: [ vHDOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } DebugDataColumn { id: _DGValvesStatesColumn @@ -447,24 +447,24 @@ y: row(0.0) width: 50 model: [ - vDGValvesStates.valveStates_VRF , - vDGValvesStates.valveStates_VRI , - vDGValvesStates.valveStates_VRD , - vDGValvesStates.valveStates_VRO , - vDGValvesStates.valveStates_VPO , - vDGValvesStates.valveStates_VBF , - vDGValvesStates.valveStates_VRC , - vDGValvesStates.valveStates_VDR , - vDGValvesStates.valveStates_VPI , - vDGValvesStates.valveStates_VSP , - vDGValvesStates.valveStates_VR1 , - vDGValvesStates.valveStates_VR2 , - vDGValvesStates.valveStates_VPD , + "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), + "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), + "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), + "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), + "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), + "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), + "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), + "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), + "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), + "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), + "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), ] label: [ "VRF", "VRI", - "VRD", + "RES", "VRO", "VPO", "VBF", @@ -525,7 +525,7 @@ textObjectName :"_HDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.hdVerMajor ) .arg(vAdjustmentVersions.hdVerMinor ) @@ -543,7 +543,7 @@ textObjectName :"_DGVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.dgVerMajor ) .arg(vAdjustmentVersions.dgVerMinor ) @@ -577,7 +577,6 @@ .arg(vPreTreatmentStates.wetSelfTestsState ) .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] - fontPixelSizeText: 30 } Text { id : _mouseEventCountText @@ -588,7 +587,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() @@ -603,7 +602,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _hdResetInformation @@ -613,7 +612,7 @@ text: "HDrst:" + vGeneralEvent.hdReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _dgResetInformation @@ -623,7 +622,7 @@ text: "DGrst:" + vGeneralEvent.dgReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Connections { target: _GuiView Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -83,4 +83,10 @@ readonly property int fontPixelCreateTreatmentTable : 24 readonly property int fontPixelCircleButtonLabel: 50 + + readonly property int fontPixelDebugTitle : 25 + readonly property int fontPixelDebugText : 28 + readonly property int fontPixelDebugLabel : 15 + readonly property string fontFamilyDebug : "Noto Sans CJK SC" + } Index: sources/model/dg/data/MDGValvesStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/model/dg/data/MDGValvesStatesData.cpp (.../MDGValvesStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGValvesStatesData.cpp (.../MDGValvesStatesData.cpp) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -8,7 +8,7 @@ * \file MDGValvesStatesData.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -18,17 +18,56 @@ QVariantList MDGValvesStates::parameters() const { QVariantList mData; - for (int i = 0; i < _data.mStates.count(); i++) { - mData += _data.mStates.at(i); + for (int i = 0; i < eFlag_Bits_Length; i++) { + mData += _data.mStates.at(i) ? "T" : "-"; // Converting "bool QBitArray::at(int i) const" to int. } + mData += _data.mVRf .value; + mData += _data.mVRi .value; + mData += _data.mRes .value; + mData += _data.mVRo .value; + mData += _data.mVPo .value; + mData += _data.mVBf .value; + mData += _data.mVRc .value; + mData += _data.mVDr .value; + mData += _data.mVPi .value; + mData += _data.mVSP .value; + mData += _data.mVR1 .value; + mData += _data.mVR2 .value; + mData += _data.mVPd .value; return mData; } bool MDGValvesStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length)) - return true ; + if (GetValue(vByteArray, index, _data.mVRf )) + if (GetValue(vByteArray, index, _data.mVRi )) + if (GetValue(vByteArray, index, _data.mRes )) + if (GetValue(vByteArray, index, _data.mVRo )) + if (GetValue(vByteArray, index, _data.mVPo )) + if (GetValue(vByteArray, index, _data.mVBf )) + if (GetValue(vByteArray, index, _data.mVRc )) + if (GetValue(vByteArray, index, _data.mVDr )) + if (GetValue(vByteArray, index, _data.mVPi )) + if (GetValue(vByteArray, index, _data.mVSP )) + if (GetValue(vByteArray, index, _data.mVR1 )) + if (GetValue(vByteArray, index, _data.mVR2 )) + if (GetValue(vByteArray, index, _data.mVPd )) + return true; else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -38,6 +77,19 @@ */ MDGValvesStates::Data MDGValvesStates::data() const { Data data; - data.mStates = _data.mStates; + data.mStates = _data.mStates ; + data.mVRf = _data.mVRf .value; + data.mVRi = _data.mVRi .value; + data.mRes = _data.mRes .value; + data.mVRo = _data.mVRo .value; + data.mVPo = _data.mVPo .value; + data.mVBf = _data.mVBf .value; + data.mVRc = _data.mVRc .value; + data.mVDr = _data.mVDr .value; + data.mVPi = _data.mVPi .value; + data.mVSP = _data.mVSP .value; + data.mVR1 = _data.mVR1 .value; + data.mVR2 = _data.mVR2 .value; + data.mVPd = _data.mVPd .value; return data; } Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -36,7 +36,21 @@ * * | Payload || * | || - * | #1:(U16) | \ref Data::mStates | + * | #01:(U16) | \ref Data::mStates | + * | #02:(U08) | \ref Data::mVRf | + | #03:(U08) | \ref Data::mVRi | + | #04:(U08) | \ref Data::mRes | + | #05:(U08) | \ref Data::mVRo | + | #06:(U08) | \ref Data::mVPo | + | #07:(U08) | \ref Data::mVBf | + | #08:(U08) | \ref Data::mVRc | + | #09:(U08) | \ref Data::mVDr | + | #10:(U08) | \ref Data::mVPi | + | #11:(U08) | \ref Data::mVSP | + | #12:(U08) | \ref Data::mVR1 | + | #13:(U08) | \ref Data::mVR2 | + | #14:(U08) | \ref Data::mVPd | + * * \sa Data * \sa Flag @@ -59,7 +73,7 @@ enum Flag { eFlag_ValveStates_VRF = 0, ///< Valve Reservoir Fill eFlag_ValveStates_VRI , ///< Valve Reservoir Inlet - eFlag_ValveStates_VRD , ///< Valve Reservoir Drain + eFlag_ValveStates_RES , ///< Reserved // it is removed and VR1,VR2 added eFlag_ValveStates_VRO , ///< Valve Reservoir Outlet eFlag_ValveStates_VPO , ///< Valve Pressure Outlet eFlag_ValveStates_VBF , ///< Valve Bypass Filter @@ -71,15 +85,28 @@ eFlag_ValveStates_VR2 , ///< Valve Reservoir 2 Drain eFlag_ValveStates_VPD , ///< Valve Production Drain - eFlag_Bits_Length = 16, - }; + eFlag_Bits_Length = 16, // the 16 bit has to be consumed since the next data starts after the 16 bit. + }; private: // DG Valves States (U16) Valves States QVariantList parameters() const override; struct { - Types::Flags mStates ; + Types::Flags mStates ; + Types::U08 mVRf ; + Types::U08 mVRi ; + Types::U08 mRes ; + Types::U08 mVRo ; + Types::U08 mVPo ; + Types::U08 mVBf ; + Types::U08 mVRc ; + Types::U08 mVDr ; + Types::U08 mVPi ; + Types::U08 mVSP ; + Types::U08 mVR1 ; + Types::U08 mVR2 ; + Types::U08 mVPd ; } _data; public: @@ -89,7 +116,20 @@ QString infoText () const override { return QString("ValvesStates"); } struct Data { - QBitArray mStates ; + QBitArray mStates ; + quint8 mVRf = 0; + quint8 mVRi = 0; + quint8 mRes = 0; + quint8 mVRo = 0; + quint8 mVPo = 0; + quint8 mVBf = 0; + quint8 mVRc = 0; + quint8 mVDr = 0; + quint8 mVPi = 0; + quint8 mVSP = 0; + quint8 mVR1 = 0; + quint8 mVR2 = 0; + quint8 mVPd = 0; }; MDGValvesStates () { } Index: sources/utility/types.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/utility/types.cpp (.../types.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/utility/types.cpp (.../types.cpp) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -38,13 +38,14 @@ * \param vData - the array of bytes * \param vStartIndex - start index of the array to be used for conversion * \param vFlags - the array of bits - * \param vLen - the amounts of bytes to be converted + * \param vLen - the amounts of bits to be converted * \return false if there is not enough data available from start index vStartIndex to the length of vLen. */ bool Types::getBits(const QByteArray &vData, int &vStartIndex, QBitArray &vFlags, int vLen) { vFlags.clear(); QByteArray data = vData.mid(vStartIndex, vLen); - if (data.length() * 8 < vLen ) + vStartIndex = vLen / 8; + if ( data.length() * 8 < vLen ) return false; vFlags = QBitArray::fromBits(data, vLen); return true; Index: sources/view/dg/data/VDGValvesStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -23,7 +23,7 @@ { valveStates_VRF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRF )); valveStates_VRI ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRI )); - valveStates_VRD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRD )); + valveStates_RES ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_RES )); valveStates_VRO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRO )); valveStates_VPO ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPO )); valveStates_VBF ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VBF )); @@ -35,26 +35,20 @@ valveStates_VR2 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR2 )); valveStates_VPD ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPD )); + valveStatus_VRF ( vData.mVRf ); + valveStatus_VRI ( vData.mVRi ); + valveStatus_RES ( vData.mRes ); + valveStatus_VRO ( vData.mVRo ); + valveStatus_VPO ( vData.mVPo ); + valveStatus_VBF ( vData.mVBf ); + valveStatus_VRC ( vData.mVRc ); + valveStatus_VDR ( vData.mVDr ); + valveStatus_VPI ( vData.mVPi ); + valveStatus_VSP ( vData.mVSP ); + valveStatus_VR1 ( vData.mVR1 ); + valveStatus_VR2 ( vData.mVR2 ); + valveStatus_VPD ( vData.mVPd ); + // Trigger should be the last refresh(true); } - -QString VDGValvesStates::text() -{ - // order changed in reverse by request. - QString text = QString() + - (valveStates_VRF () ? "1" : "0" ) + "" + - (valveStates_VRI () ? "1" : "0" ) + "" + - (valveStates_VRD () ? "1" : "0" ) + "" + - (valveStates_VRO () ? "1" : "0" ) + "" + - (valveStates_VPO () ? "1" : "0" ) + "" + - (valveStates_VBF () ? "1" : "0" ) + "" + - (valveStates_VRC () ? "1" : "0" ) + "" + - (valveStates_VDR () ? "1" : "0" ) + "" + - (valveStates_VPI () ? "1" : "0" ) + "" + - (valveStates_VSP () ? "1" : "0" ) + "" + - (valveStates_VR1 () ? "1" : "0" ) + "" + - (valveStates_VR2 () ? "1" : "0" ) + "" + - (valveStates_VPD () ? "1" : "0" ); - return text; -} Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -36,13 +36,11 @@ { Q_OBJECT - // disabled coco begin validated: Has been tested manually. This is a general messages received trigger, but is not used yet. TRIGGER ( bool , refresh , false) - // disabled coco end PROPERTY( quint8 , valveStates_VRF , 0 ) PROPERTY( quint8 , valveStates_VRI , 0 ) - PROPERTY( quint8 , valveStates_VRD , 0 ) + PROPERTY( quint8 , valveStates_RES , 0 ) PROPERTY( quint8 , valveStates_VRO , 0 ) PROPERTY( quint8 , valveStates_VPO , 0 ) PROPERTY( quint8 , valveStates_VBF , 0 ) @@ -54,11 +52,20 @@ PROPERTY( quint8 , valveStates_VR2 , 0 ) PROPERTY( quint8 , valveStates_VPD , 0 ) - Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) + PROPERTY( quint8 , valveStatus_VRF , 0 ) + PROPERTY( quint8 , valveStatus_VRI , 0 ) + PROPERTY( quint8 , valveStatus_RES , 0 ) + PROPERTY( quint8 , valveStatus_VRO , 0 ) + PROPERTY( quint8 , valveStatus_VPO , 0 ) + PROPERTY( quint8 , valveStatus_VBF , 0 ) + PROPERTY( quint8 , valveStatus_VRC , 0 ) + PROPERTY( quint8 , valveStatus_VDR , 0 ) + PROPERTY( quint8 , valveStatus_VPI , 0 ) + PROPERTY( quint8 , valveStatus_VSP , 0 ) + PROPERTY( quint8 , valveStatus_VR1 , 0 ) + PROPERTY( quint8 , valveStatus_VR2 , 0 ) + PROPERTY( quint8 , valveStatus_VPD , 0 ) VIEW_DEC(VDGValvesStates, DGValvesStatesData) - -public slots: - QString text(); }; }