Index: sources/model/dg/data/MDGConductivityData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -35,11 +35,19 @@ * * | Payload || * | || - * | #1:(F32) | \ref Data::mRORejectioRatio | - * | #2:(F32) | \ref Data::mCPi | - * | #3:(F32) | \ref Data::mCPo | - * | #4:(F32) | \ref Data::mCD1 | - * | #5:(F32) | \ref Data::mCD2 | + * | #01:(F32) | \ref Data::mRORejectioRatio | + * | #02:(F32) | \ref Data::mCPi | + * | #03:(F32) | \ref Data::mCPo | + * | #04:(F32) | \ref Data::mCD1 | + * | #05:(F32) | \ref Data::mCD2 | + * | #06:(F32) | \ref Data::mCPiRaw | + * | #07:(F32) | \ref Data::mCPoRaw | + * | #08:(F32) | \ref Data::mCD1Raw | + * | #09:(F32) | \ref Data::mCD2Raw | + * | #10:(U32) | \ref Data::mCPiSensorStatus | + * | #11:(U32) | \ref Data::mCPoSensorStatus | + * | #12:(U32) | \ref Data::mCD1SensorStatus | + * | #13:(U32) | \ref Data::mCD2SensorStatus | * * * \sa Data @@ -65,6 +73,15 @@ Types::F32 mCPo ; Types::F32 mCD1 ; Types::F32 mCD2 ; + Types::F32 mCPiRaw ; + Types::F32 mCPoRaw ; + Types::F32 mCD1Raw ; + Types::F32 mCD2Raw ; + Types::U32 mCPiSensorStatus ; + Types::U32 mCPoSensorStatus ; + Types::U32 mCD1SensorStatus ; + Types::U32 mCD2SensorStatus ; + } _data; public: @@ -73,11 +90,19 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - float mRORejectionRatio = 0; ///< RO Rejection Ratio - float mCPi = 0; ///< CPi conductivity - float mCPo = 0; ///< CPo conductivity - float mCD1 = 0; ///< CP1 conductivity - float mCD2 = 0; ///< CP2 conductivity + float mRORejectionRatio = 0; ///< RO Rejection Ratio + float mCPi = 0; ///< CPi conductivity + float mCPo = 0; ///< CPo conductivity + float mCD1 = 0; ///< CP1 conductivity + float mCD2 = 0; ///< CP2 conductivity + float mCPiRaw = 0; ///< CPi Raw + float mCPoRaw = 0; ///< CPo Raw + float mCD1Raw = 0; ///< CD1 Raw + float mCD2Raw = 0; ///< CD2 Raw + quint32 mCPiSensorStatus = 0; ///< CPi Sensor Status + quint32 mCPoSensorStatus = 0; ///< CPo Sensor Status + quint32 mCD1SensorStatus = 0; ///< CD1 Sensor Status + quint32 mCD2SensorStatus = 0; ///< CD2 Sensor Status }; MDGConductivityData () { }