Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2624ed8acc30847fb38816fb4ae6073518b091f9 -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -116,11 +116,11 @@ //FP Data Messages {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_FPPressuresData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_FPPressuresData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_FPLevelData , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_FPFlowSensorData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_FPFlowSensorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_FPConductivityData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_FPTemperaturesData , 13 * 4 }, // 13 parameters each 4bytes + {Gui::GuiActionType::ID_FPTemperaturesData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_FPROBoosterPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPRORejectionPercentageData , 5 * 4 }, // 5 parameters each 4bytes // HD Data Messages Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2624ed8acc30847fb38816fb4ae6073518b091f9 -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -201,7 +201,7 @@ ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DGAccelerometerData = 0x3400, // 52 + ID_DGAccelerometerData = 0x340F, // 52 ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED ID_DDConductivityData = 0x1F00, // 31 //// ----- @LEAHIZED Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -324,7 +324,7 @@ DebugDataColumn { id: _DDHydraulicsValveColumn textObjectName :"_DDHydraulicValveData" - title : qsTr(" Hyd Valve ") + title : qsTr("[0x1B] Hyd Valve ") anchors { top : _DDGenDialColumn.bottom topMargin : verticalSpacing @@ -417,7 +417,7 @@ DebugDataColumn { id: _DDBCValvesColumn textObjectName :"_DDBCValvesData" - title : qsTr(" BC Valves ") + title : qsTr("[0x1B] BC Valves ") anchors { top : _DDBloodLeakColumn.bottom topMargin : verticalSpacing @@ -447,7 +447,7 @@ DebugDataColumn { id: _DDIOValvesColumn textObjectName :"_DDIOValvesColumn" - title : qsTr(" IO Valves ") + title : qsTr("[0x1B] IO Valves ") anchors { top : _DDCondColumn.bottom topMargin : verticalSpacing @@ -465,7 +465,7 @@ DebugDataColumn { id: _DDSpareValvesColumn textObjectName :"_DDSpareValvesColumn" - title : qsTr(" Spare Valves ") + title : qsTr("[0x1B] Spare Valves ") anchors { top : _DDHeatersColumn.bottom topMargin : verticalSpacing @@ -495,7 +495,7 @@ DebugDataColumn { id: _DDFPValvesColumn textObjectName :"_DDFPValvesColumn" - title : qsTr(" FP Valves ") + title : qsTr("[0x1B] FP Valves ") anchors { top : _DDConcentratePumpColumn.bottom topMargin : verticalSpacing Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -r31f5163d55d847f16a0566fb773c26a11734279f -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 31f5163d55d847f16a0566fb773c26a11734279f) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -32,39 +32,31 @@ DebugDataColumn { id: _FPPressureColumn textObjectName :"_FPPressureData" - title : qsTr(" Pressure ") + title : qsTr("[0x34] Pressure ") anchors { top : parent.top left : parent.left } model: [ - vFPPressures.beforePresureRegulator .toFixed(2) , - vFPPressures.afterPressureRegulator .toFixed(2) , - vFPPressures.beforeInletConductivity .toFixed(2) , - vFPPressures.beforeROFilter .toFixed(2) , - vFPPressures.afterROFilter .toFixed(2) , - vFPPressures.beforeROPump .toFixed(2) , - vFPPressures.ROConcentrate .toFixed(2) , - vFPPressures.ROConcentrateDrop .toFixed(2) , - vFPPressures.drainDrop .toFixed(2) , + vFPPressures.m3Pressure .toFixed(2) , + vFPPressures.p8Pressure .toFixed(2) , + vFPPressures.p13Pressure .toFixed(2) , + vFPPressures.p17Pressure .toFixed(2) , + vFPPressures.p46Pressure .toFixed(2) , ] label: [ - "M1 bRegPSI ", - "M3 aRegPSI ", - "P8 bInCond ", - "P13 bROFilter ", - "P17 aROFilter ", - "X1 bROPump ", - "X2 ROConc ", - "X3 dROConc ", - "X4 dDrain ", + "M3 ", + "P8 ", + "P13 ", + "P17 ", + "P46 ", ] } DebugDataColumn { id: _FPROPumpColumn textObjectName :"_FPROPumpData" - title : qsTr(" RO Pump ") + title : qsTr("[0x32] RO Pump ") anchors { top : parent.top left : _FPPressureColumn.right @@ -96,7 +88,7 @@ DebugDataColumn { id: _FPRoRejectionPercentageColumn textObjectName :"_FPRoRejectionPercentageColumn" - title : qsTr(" RO Rejection Ratio ") + title : qsTr("[0x71] RO Rejection Ratio ") anchors { top : _FPROPumpColumn.bottom topMargin : spacing @@ -120,7 +112,7 @@ DebugDataColumn { id: _FPBoostPumpColumn textObjectName :"_FPBoostPumpData" - title : qsTr(" Boost Pump ") + title : qsTr("[0x50] Boost Pump ") anchors { top : parent.top left : _FPROPumpColumn.right @@ -152,69 +144,61 @@ DebugDataColumn { id: _FPTemperatureColumn textObjectName :"_FPTemperatureData" - title : qsTr(" Temperature ") + title : qsTr("[0x39] Temperature ") anchors { top : parent.top left : _FPBoostPumpColumn.right leftMargin : spacing } model: [ - vFPTemperature.inletConductivityTemp .toFixed(2) , - vFPTemperature.outletConductivityTemp .toFixed(2) , - vFPTemperature.beforePressureRegulatorTemp .toFixed(2) , - vFPTemperature.afterPressureRegulatorTemp .toFixed(2) , - vFPTemperature.beforeInletConductivityTemp .toFixed(2) , - vFPTemperature.beforeROFilterTemp .toFixed(2) , - vFPTemperature.afterROFilterTemp .toFixed(2) , - vFPTemperature.beforeROPumpTemp .toFixed(2) , - vFPTemperature.ROConcentrateTemp .toFixed(2) , - vFPTemperature.ROConcentratePumpTemp .toFixed(2) , - vFPTemperature.drainDropTemp .toFixed(2) , - vFPTemperature.ROInletTemp .toFixed(2) , - vFPTemperature.ROOutletTemp .toFixed(2) , + vFPTemperature.m3Temp .toFixed(2) , + vFPTemperature.p8Temp .toFixed(2) , + vFPTemperature.p13Temp .toFixed(2) , + vFPTemperature.p17Temp .toFixed(2) , + vFPTemperature.p46Temp .toFixed(2) , + vFPTemperature.p10Temp .toFixed(2) , + vFPTemperature.p19Temp .toFixed(2) , + vFPTemperature.p7Temp .toFixed(2) , + vFPTemperature.p16Temp .toFixed(2) , + vFPTemperature.p7InternalTemp .toFixed(2) , + vFPTemperature.p16InternalTemp .toFixed(2) , ] label: [ - "P10 inCond ", - "P19 outCond ", - "M1 bReg ", - "M3 aReg ", - "P8 bInCond ", - "P13 bRO ", - "P17 aRO ", - "X1 bROPump ", - "X2 ROConc ", - "X3 ROConcPump ", - "X4 Drain ", - "P7 ROIn ", - "P16 ROOut ", + "M3Temp ", + "P8Temp ", + "P13Temp ", + "P17Temp ", + "P46Temp ", + "P10Temp ", + "P19Temp ", + "P7Temp ", + "P16Temp ", + "P7InternalTemp ", + "P16InternalTemp ", ] } DebugDataColumn { id: _FPFlowColumn textObjectName :"_FPFlowData" - title : qsTr(" Flow ") + title : qsTr("[0x36] Flow ") anchors { top : parent.top left : _FPTemperatureColumn.right leftMargin : spacing } model: [ - vFPFlow.waterInletFlow .toFixed(2) , - vFPFlow.waterInletTemp .toFixed(2) , - vFPFlow.rOFilterOutletFlow .toFixed(2) , - vFPFlow.rOFilterOutletTemp .toFixed(2) , + vFPFlow.p7Flow .toFixed(2) , + vFPFlow.p16Flow .toFixed(2) , ] label: [ "P7 FlowIn ", - "P7 TempIn ", "P16 FlowOut ", - "P16 TempOut ", ] } DebugDataColumn { id: _FPLevelColumn textObjectName :"_FPLevelData" - title : qsTr(" Level ") + title : qsTr("[0x35] Level ") anchors { top : parent.top left : _FPFlowColumn.right @@ -230,7 +214,7 @@ DebugDataColumn { id: _FPConductivityColumn textObjectName :"_FPConductivityData" - title : qsTr(" Conductivity ") + title : qsTr("[0x37] Conductivity ") anchors { top : _FPPressureColumn.bottom topMargin : spacing Index: sources/model/dg/data/MDGAccelerometerData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -33,7 +33,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x3400 | 0x080 | 8 | 1 Hz | N | DG | UI | DG Accelerometer Data | + * | 0x340F | 0x080 | 8 | 1 Hz | N | DG | UI | DG Accelerometer Data | * * | Payload || * | || Index: sources/model/fp/data/MFPFlowData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPFlowData.cpp (.../MFPFlowData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPFlowData.cpp (.../MFPFlowData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -20,17 +20,13 @@ return { _data.mP7Flow .value, _data.mP16Flow .value, - _data.mP7Temp .value, - _data.mP16Temp .value, }; } bool MFPFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mP7Flow )) goto lError; if ( ! GetValue(vByteArray, index, _data.mP16Flow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; return true ; @@ -47,9 +43,8 @@ */ MFPFlow::Data MFPFlow::data() const { Data data; - data.mWaterInletFlow = _data.mP7Flow .value; - data.mROFilterOutletFlow = _data.mP16Flow .value; - data.mWaterInletTemp = _data.mP7Temp .value; - data.mROFilterOutletTemp = _data.mP16Temp .value; + data.mP7Flow = _data.mP7Flow .value; + data.mP16Flow = _data.mP16Flow .value; + return data; } Index: sources/model/fp/data/MFPFlowData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPFlowData.h (.../MFPFlowData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPFlowData.h (.../MFPFlowData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -38,8 +38,6 @@ * | || * | #01:(F32) | \ref Data::mP7Flow | * | #02:(F32) | \ref Data::mP16Flow | - * | #03:(F32) | \ref Data::mP7Temp | - * | #04:(F32) | \ref Data::mP16Temp | * * \sa Data * @@ -61,8 +59,6 @@ struct { Types::F32 mP7Flow ; ///< P7 flow rate at water inlet. Types::F32 mP16Flow ; ///< P16 flow rate at RO filter outlet. - Types::F32 mP7Temp ; ///< P7 temperature from inlet flow sensor. - Types::F32 mP16Temp ; ///< P16 temperature from outlet flow sensor. } _data; public: @@ -72,10 +68,8 @@ QString infoText () const override { return QString("Flow") ; } struct Data { - float mWaterInletFlow = 0; ///< P7 flow rate at water inlet. - float mROFilterOutletFlow = 0; ///< P16 flow rate at RO filter outlet. - float mWaterInletTemp = 0; ///< P7 temperature from inlet flow sensor. - float mROFilterOutletTemp = 0; ///< P16 temperature from outlet flow sensor. + float mP7Flow = 0; ///< P7 flow rate at water inlet. + float mP16Flow = 0; ///< P16 flow rate at RO filter outlet. }; MFPFlow () {} Index: sources/model/fp/data/MFPPressuresData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPPressuresData.cpp (.../MFPPressuresData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPPressuresData.cpp (.../MFPPressuresData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -18,29 +18,21 @@ QVariantList MFPPressures::parameters() const { return { - _data.m1Pressure .value, - _data.m3Pressure .value, - _data.p8Pressure .value, - _data.p13Pressure .value, - _data.p17Pressure .value, - _data.x1Pressure .value, - _data.x2Pressure .value, - _data.x3Pressure .value, - _data.x4Pressure .value, + _data.mM3Pressure .value, + _data.mP8Pressure .value, + _data.mP13Pressure .value, + _data.mP17Pressure .value, + _data.mP46Pressure .value, }; } bool MFPPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.m1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p8Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p13Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p17Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x2Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x4Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mM3Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP8Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP13Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP17Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP46Pressure )) goto lError; return true ; @@ -57,14 +49,11 @@ */ MFPPressures::Data MFPPressures::data() const { Data data; - data.mBeforePresureRegulator = _data.m1Pressure .value; - data.mAfterPressureRegulator = _data.m3Pressure .value; - data.mBeforeInletConductivity = _data.p8Pressure .value; - data.mBeforeROFilter = _data.p13Pressure .value; - data.mAfterROFilter = _data.p17Pressure .value; - data.mBeforeROPump = _data.x1Pressure .value; - data.mROConcentrate = _data.x2Pressure .value; - data.mROConcentrateDrop = _data.x3Pressure .value; - data.mDrainDrop = _data.x4Pressure .value; + data.mM3Pressure = _data.mM3Pressure .value; + data.mP8Pressure = _data.mP8Pressure .value; + data.mP13Pressure = _data.mP13Pressure .value; + data.mP17Pressure = _data.mP17Pressure .value; + data.mP46Pressure = _data.mP46Pressure .value; + return data; } Index: sources/model/fp/data/MFPPressuresData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPPressuresData.h (.../MFPPressuresData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPPressuresData.h (.../MFPPressuresData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -36,15 +36,11 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mBeforePresureRegulator | - * | #02:(F32) | \ref Data::mAfterPressureRegulator | - * | #03:(F32) | \ref Data::mBeforeInletConductivity | - * | #04:(F32) | \ref Data::mBeforeROFilter | - * | #05:(F32) | \ref Data::mAfterROFilter | - * | #06:(F32) | \ref Data::mBeforeROPump | - * | #07:(F32) | \ref Data::mROConcentrate | - * | #08:(F32) | \ref Data::mROConcentrateDrop | - * | #09:(F32) | \ref Data::mDrainDrop | + * | #01:(F32) | \ref Data::mM3Pressure | + * | #02:(F32) | \ref Data::mP8Pressure | + * | #03:(F32) | \ref Data::mP13Pressure | + * | #04:(F32) | \ref Data::mP17Pressure | + * | #05:(F32) | \ref Data::mP46Pressure | * * \sa Data * @@ -64,15 +60,11 @@ QVariantList parameters() const override; struct { - Types::F32 m1Pressure ; ///< Pressure before pressure regulator (M1) - Types::F32 m3Pressure ; ///< Pressure after pressure regulator (M3) - Types::F32 p8Pressure ; ///< Pressure before inlet conductivity sensor (P8) - Types::F32 p13Pressure ; ///< Pressure before RO filter (P13) - Types::F32 p17Pressure ; ///< Pressure after RO filter (P17) - Types::F32 x1Pressure ; ///< Pressure before RO pump (X1) - Types::F32 x2Pressure ; ///< Pressure RO Concentrate - Types::F32 x3Pressure ; ///< Pressure RO Concentrate drop - Types::F32 x4Pressure ; ///< Pressure drain drop + Types::F32 mM3Pressure ; ///< Pressure after pressure regulator (M3) + Types::F32 mP8Pressure ; ///< Pressure before inlet conductivity sensor (P8) + Types::F32 mP13Pressure ; ///< Pressure before RO filter (P13) + Types::F32 mP17Pressure ; ///< Pressure after RO filter (P17) + Types::F32 mP46Pressure ; ///< Pressure before RO pump (X1) } _data; public: @@ -82,15 +74,11 @@ QString infoText () const override { return QString("Pressures"); } struct Data { - float mBeforePresureRegulator = 0; ///< Pressure before pressure regulator (M1) - float mAfterPressureRegulator = 0; ///< Pressure after pressure regulator (M3) - float mBeforeInletConductivity = 0; ///< Pressure before inlet conductivity sensor (P8) - float mBeforeROFilter = 0; ///< Pressure before RO filter (P13) - float mAfterROFilter = 0; ///< Pressure after RO filter (P17) - float mBeforeROPump = 0; ///< Pressure before RO pump (X1) - float mROConcentrate = 0; ///< Pressure RO Concentrate - float mROConcentrateDrop = 0; ///< Pressure RO Concentrate drop - float mDrainDrop = 0; ///< Pressure drain drop + float mM3Pressure = 0; ///< Pressure before pressure regulator (M1) + float mP8Pressure = 0; ///< Pressure after pressure regulator (M3) + float mP13Pressure = 0; ///< Pressure before inlet conductivity sensor (P8) + float mP17Pressure = 0; ///< Pressure before RO filter (P13) + float mP46Pressure = 0; ///< Pressure after RO filter (P17) }; MFPPressures () {} Index: sources/model/fp/data/MFPTemperatureData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPTemperatureData.cpp (.../MFPTemperatureData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPTemperatureData.cpp (.../MFPTemperatureData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -18,37 +18,33 @@ QVariantList MFPTemperature::parameters() const { return { - _data.mP10Temp .value, - _data.mP19Temp .value, - _data.mM1Temp .value, - _data.mM3Temp .value, - _data.mP8Temp .value, - _data.mP13Temp .value, - _data.mP17Temp .value, - _data.mX1Temp .value, - _data.mX2Temp .value, - _data.mX3Temp .value, - _data.mX4Temp .value, - _data.mP7Temp .value, - _data.mP16Temp .value, + _data.mM3Temp .value, + _data.mP8Temp .value, + _data.mP13Temp .value, + _data.mP17Temp .value, + _data.mP46Temp .value, + _data.mP10Temp .value, + _data.mP19Temp .value, + _data.mP7Temp .value, + _data.mP16Temp .value, + _data.mP7InternalTemp .value, + _data.mP16InternalTemp .value, }; } bool MFPTemperature::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mP10Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP19Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mM1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mM3Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP8Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP13Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP17Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX2Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX3Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX4Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mM3Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP8Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP13Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP17Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP46Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP10Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP19Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP7InternalTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP16InternalTemp )) goto lError; return true ; @@ -65,18 +61,17 @@ */ MFPTemperature::Data MFPTemperature::data() const { Data data; - data.mInletConductivityTemp = _data.mP10Temp .value; - data.mOutletConductivityTemp = _data.mP19Temp .value; - data.mBeforePressureRegulatorTemp = _data.mM1Temp .value; - data.mAfterPressureRegulatorTemp = _data.mM3Temp .value; - data.mBeforeInletConductivityTemp = _data.mP8Temp .value; - data.mBeforeROFilterTemp = _data.mP13Temp .value; - data.mAfterROFilterTemp = _data.mP17Temp .value; - data.mBeforeROPumpTemp = _data.mX1Temp .value; - data.mROConcentrateTemp = _data.mX2Temp .value; - data.mROConcentratePumpTemp = _data.mX3Temp .value; - data.mDrainDropTemp = _data.mX4Temp .value; - data.mROInletTemp = _data.mP7Temp .value; - data.mROOutletTemp = _data.mP16Temp .value; + data.mM3Temp = _data.mM3Temp .value; + data.mP8Temp = _data.mP8Temp .value; + data.mP13Temp = _data.mP13Temp .value; + data.mP17Temp = _data.mP17Temp .value; + data.mP46Temp = _data.mP46Temp .value; + data.mP10Temp = _data.mP10Temp .value; + data.mP19Temp = _data.mP19Temp .value; + data.mP7Temp = _data.mP7Temp .value; + data.mP16Temp = _data.mP16Temp .value; + data.mP7InternalTemp = _data.mP7InternalTemp .value; + data.mP16InternalTemp = _data.mP16InternalTemp .value; + return data; } Index: sources/model/fp/data/MFPTemperatureData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPTemperatureData.h (.../MFPTemperatureData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPTemperatureData.h (.../MFPTemperatureData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -36,19 +36,17 @@ * * | Payload || * | || - * | #01:(U32) | \ref Data::mInletConductivityTemp | - * | #02:(U32) | \ref Data::mOutletConductivityTemp | - * | #03:(U32) | \ref Data::mBeforePressureRegulatorTemp | - * | #04:(F32) | \ref Data::mAfterPressureRegulatorTemp | - * | #05:(F32) | \ref Data::mBeforeInletConductivityTemp | - * | #06:(F32) | \ref Data::mBeforeROFilterTemp | - * | #07:(F32) | \ref Data::mAfterROFilterTemp | - * | #08:(F32) | \ref Data::mBeforeROPumpTemp | - * | #09:(F32) | \ref Data::mROConcentrateTemp | - * | #11:(F32) | \ref Data::mROConcentratePumpTemp | - * | #12:(F32) | \ref Data::mDrainDropTemp | - * | #13:(F32) | \ref Data::mROInletTemp | - * | #14:(F32) | \ref Data::mROOutletTemp | + * | #01:(U32) | \ref Data::mM3Temp | + * | #02:(U32) | \ref Data::mP8Temp | + * | #03:(U32) | \ref Data::mP13Temp | + * | #04:(F32) | \ref Data::mP17Temp | + * | #05:(F32) | \ref Data::mP46Temp | + * | #06:(F32) | \ref Data::mP10Temp | + * | #07:(F32) | \ref Data::mP19Temp | + * | #08:(F32) | \ref Data::mP7Temp | + * | #09:(F32) | \ref Data::mP16Temp | + * | #10:(F32) | \ref Data::mP7InternalTemp | + * | #11:(F32) | \ref Data::mP16InternalTemp | * * \sa Data * @@ -68,19 +66,18 @@ QVariantList parameters() const override; struct { - Types::F32 mP10Temp ; ///< P10 temperature from inlet conductivity sensor. - Types::F32 mP19Temp ; ///< P19 temperature from outlet conductivity sensor. - Types::F32 mM1Temp ; ///< Temperature before pressure regulator (M1) - Types::F32 mM3Temp ; ///< Temperature after pressure regulator (M3) - Types::F32 mP8Temp ; ///< Temperature before inlet conductivity sensor (P8) - Types::F32 mP13Temp ; ///< Temperature before RO filter (P13) - Types::F32 mP17Temp ; ///< Temperature after RO filter (P17) - Types::F32 mX1Temp ; ///< Temperature before RO pump (X1) - Types::F32 mX2Temp ; ///< Temperature RO Concentrate - Types::F32 mX3Temp ; ///< Temperature RO Concentrate drop - Types::F32 mX4Temp ; ///< Temperature drain drop - Types::F32 mP7Temp ; ///< Temperature RO inlet - Types::F32 mP16Temp ; ///< Temperature RO outlet + + Types::F32 mM3Temp ; ///< Temperature after pressure regulator (M3) + Types::F32 mP8Temp ; ///< Temperature before inlet conductivity sensor (P8) + Types::F32 mP13Temp ; ///< Temperature before RO filter (P13) + Types::F32 mP17Temp ; ///< Temperature after RO filter (P17) + Types::F32 mP46Temp ; ///< P19 temperature from outlet conductivity sensor. + Types::F32 mP10Temp ; ///< P10 temperature from inlet conductivity sensor. + Types::F32 mP19Temp ; ///< P10 temperature from inlet conductivity sensor. + Types::F32 mP7Temp ; ///< Temperature RO inlet + Types::F32 mP16Temp ; ///< Temperature RO outlet + Types::F32 mP7InternalTemp ; ///< Temperature before RO pump (X1) + Types::F32 mP16InternalTemp ; ///< Temperature RO Concentrate } _data; public: @@ -90,19 +87,17 @@ QString infoText () const override { return QString("Temperature") ; } struct Data { - float mInletConductivityTemp = 0; ///< P10 temperature from inlet conductivity sensor. - float mOutletConductivityTemp = 0; ///< P19 temperature from outlet conductivity sensor. - float mBeforePressureRegulatorTemp = 0; ///< Temperature before pressure regulator (M1) - float mAfterPressureRegulatorTemp = 0; ///< Temperature after pressure regulator (M3) - float mBeforeInletConductivityTemp = 0; ///< Temperature before inlet conductivity sensor (P8) - float mBeforeROFilterTemp = 0; ///< Temperature before RO filter (P13) - float mAfterROFilterTemp = 0; ///< Temperature after RO filter (P17) - float mBeforeROPumpTemp = 0; ///< Temperature before RO pump (X1) - float mROConcentrateTemp = 0; ///< Temperature RO Concentrate - float mROConcentratePumpTemp = 0; ///< Temperature RO Concentrate drop - float mDrainDropTemp = 0; ///< Temperature drain drop - float mROInletTemp = 0; ///< Temperature RO inlet - float mROOutletTemp = 0; ///< Temperature RO outlet + float mM3Temp = 0; ///< P10 temperature from inlet conductivity sensor. + float mP8Temp = 0; ///< P19 temperature from outlet conductivity sensor. + float mP13Temp = 0; ///< Temperature before pressure regulator (M1) + float mP17Temp = 0; ///< Temperature after pressure regulator (M3) + float mP46Temp = 0; ///< Temperature before inlet conductivity sensor (P8) + float mP10Temp = 0; ///< Temperature before RO filter (P13) + float mP19Temp = 0; ///< Temperature after RO filter (P17) + float mP7Temp = 0; ///< Temperature before RO pump (X1) + float mP16Temp = 0; ///< Temperature RO Concentrate + float mP7InternalTemp = 0; ///< Temperature RO Concentrate drop + float mP16InternalTemp = 0; ///< Temperature drain drop }; MFPTemperature () {} Index: sources/view/fp/data/VFPFlowData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPFlowData.cpp (.../VFPFlowData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPFlowData.cpp (.../VFPFlowData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -21,8 +21,6 @@ void VFPFlow::onActionReceive(const FPFlowData &vData) { - waterInletFlow ( vData.mWaterInletFlow ); - rOFilterOutletFlow ( vData.mROFilterOutletFlow ); - waterInletTemp ( vData.mWaterInletTemp ); - rOFilterOutletTemp ( vData.mROFilterOutletTemp ); + p7Flow ( vData.mP7Flow ); + p16Flow ( vData.mP16Flow ); } Index: sources/view/fp/data/VFPFlowData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPFlowData.h (.../VFPFlowData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPFlowData.h (.../VFPFlowData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -36,10 +36,8 @@ { Q_OBJECT - PROPERTY( float , waterInletFlow , 0) - PROPERTY( float , rOFilterOutletFlow , 0) - PROPERTY( float , waterInletTemp , 0) - PROPERTY( float , rOFilterOutletTemp , 0) + PROPERTY( float , p7Flow , 0) + PROPERTY( float , p16Flow , 0) VIEW_DEC(VFPFlow, FPFlowData) }; Index: sources/view/fp/data/VFPPressuresData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPPressuresData.cpp (.../VFPPressuresData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPPressuresData.cpp (.../VFPPressuresData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -21,13 +21,10 @@ void VFPPressures::onActionReceive(const FPPressuresData &vData) { - beforePresureRegulator ( vData.mBeforePresureRegulator ); - afterPressureRegulator ( vData.mAfterPressureRegulator ); - beforeInletConductivity ( vData.mBeforeInletConductivity ); - beforeROFilter ( vData.mBeforeROFilter ); - afterROFilter ( vData.mAfterROFilter ); - beforeROPump ( vData.mBeforeROPump ); - ROConcentrate ( vData.mROConcentrate ); - ROConcentrateDrop ( vData.mROConcentrateDrop ); - drainDrop ( vData.mDrainDrop ); + m3Pressure ( vData.mM3Pressure ); + p8Pressure ( vData.mP8Pressure ); + p13Pressure ( vData.mP13Pressure ); + p17Pressure ( vData.mP17Pressure ); + p46Pressure ( vData.mP46Pressure ); + } Index: sources/view/fp/data/VFPPressuresData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPPressuresData.h (.../VFPPressuresData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPPressuresData.h (.../VFPPressuresData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -36,15 +36,11 @@ { Q_OBJECT - PROPERTY( float , beforePresureRegulator , 0) - PROPERTY( float , afterPressureRegulator , 0) - PROPERTY( float , beforeInletConductivity , 0) - PROPERTY( float , beforeROFilter , 0) - PROPERTY( float , afterROFilter , 0) - PROPERTY( float , beforeROPump , 0) - PROPERTY( float , ROConcentrate , 0) - PROPERTY( float , ROConcentrateDrop , 0) - PROPERTY( float , drainDrop , 0) + PROPERTY( float , m3Pressure , 0) + PROPERTY( float , p8Pressure , 0) + PROPERTY( float , p13Pressure , 0) + PROPERTY( float , p17Pressure , 0) + PROPERTY( float , p46Pressure , 0) VIEW_DEC(VFPPressures, FPPressuresData) }; Index: sources/view/fp/data/VFPTemperatureData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPTemperatureData.cpp (.../VFPTemperatureData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPTemperatureData.cpp (.../VFPTemperatureData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -21,17 +21,15 @@ void VFPTemperature::onActionReceive(const FPTemperatureData &vData) { - inletConductivityTemp ( vData.mInletConductivityTemp ); - outletConductivityTemp ( vData.mOutletConductivityTemp ); - beforePressureRegulatorTemp ( vData.mBeforePressureRegulatorTemp ); - afterPressureRegulatorTemp ( vData.mAfterPressureRegulatorTemp ); - beforeInletConductivityTemp ( vData.mBeforeInletConductivityTemp ); - beforeROFilterTemp ( vData.mBeforeROFilterTemp ); - afterROFilterTemp ( vData.mAfterROFilterTemp ); - beforeROPumpTemp ( vData.mBeforeROPumpTemp ); - ROConcentrateTemp ( vData.mROConcentrateTemp ); - ROConcentratePumpTemp ( vData.mROConcentratePumpTemp ); - drainDropTemp ( vData.mDrainDropTemp ); - ROInletTemp ( vData.mROInletTemp ); - ROOutletTemp ( vData.mROOutletTemp ); + m3Temp ( vData.mM3Temp ); + p8Temp ( vData.mP8Temp ); + p13Temp ( vData.mP13Temp ); + p17Temp ( vData.mP17Temp ); + p46Temp ( vData.mP46Temp ); + p10Temp ( vData.mP10Temp ); + p19Temp ( vData.mP19Temp ); + p7Temp ( vData.mP7Temp ); + p16Temp ( vData.mP16Temp ); + p7InternalTemp ( vData.mP7InternalTemp ); + p16InternalTemp ( vData.mP16InternalTemp ); } Index: sources/view/fp/data/VFPTemperatureData.h =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/view/fp/data/VFPTemperatureData.h (.../VFPTemperatureData.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/view/fp/data/VFPTemperatureData.h (.../VFPTemperatureData.h) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -36,19 +36,17 @@ { Q_OBJECT - PROPERTY( float , inletConductivityTemp , 0) - PROPERTY( float , outletConductivityTemp , 0) - PROPERTY( float , beforePressureRegulatorTemp , 0) - PROPERTY( float , afterPressureRegulatorTemp , 0) - PROPERTY( float , beforeInletConductivityTemp , 0) - PROPERTY( float , beforeROFilterTemp , 0) - PROPERTY( float , afterROFilterTemp , 0) - PROPERTY( float , beforeROPumpTemp , 0) - PROPERTY( float , ROConcentrateTemp , 0) - PROPERTY( float , ROConcentratePumpTemp , 0) - PROPERTY( float , drainDropTemp , 0) - PROPERTY( float , ROInletTemp , 0) - PROPERTY( float , ROOutletTemp , 0) + PROPERTY( float , m3Temp , 0) + PROPERTY( float , p8Temp , 0) + PROPERTY( float , p13Temp , 0) + PROPERTY( float , p17Temp , 0) + PROPERTY( float , p46Temp , 0) + PROPERTY( float , p10Temp , 0) + PROPERTY( float , p19Temp , 0) + PROPERTY( float , p7Temp , 0) + PROPERTY( float , p16Temp , 0) + PROPERTY( float , p7InternalTemp , 0) + PROPERTY( float , p16InternalTemp , 0) VIEW_DEC(VFPTemperature, FPTemperatureData) };