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 () {}