Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2022-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2022-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MHDBloodLeakData.h - * \author (last) Behrouz NematiPour - * \date (last) 09-Mar-2022 + * \author (last) Dara Navaei + * \date (last) 06-Nov-2024 * \author (original) Michael Garthwaite * \date (original) 17-Feb-2022 * @@ -38,16 +38,16 @@ * * | Payload || * | || - * | #01:(U32) | \ref Data::mBloodLeakStatus | - * | #02:(U32) | \ref Data::mBloodLeakState | - * | #03:(U32) | \ref Data::mBloodLeakZeroStatusCounter | - * | #04:(U32) | \ref Data::mBloodLeakCounter | - * | #05:(u32) | \ref Data::mBloodLeakZeroedStatus | - * | #06:(U32) | \ref Data::mBloodLeakDetectSetPoint | - * | #07:(U32) | \ref Data::mBloodLeakDetectLevel | - * | #08:(U32) | \ref Data::mBloodLeakStatusCount | - * | #09:(U32) | \ref Data::mBloodLeakLEDIntensity | - * | #10:(U32) | \ref Data::mBloodLeakRegisterCounter | + * | #01:(U32) | \ref Data::mBloodLeakStatus | + * | #02:(U32) | \ref Data::mBloodLeakState | + * | #03:(U32) | \ref Data::mBloodLeakPersistentCounter | + * | #04:(U32) | \ref Data::mBloodLeakSerialCommState | + * | #05:(U32) | \ref Data::mBloodLeakIntensity | + * | #06:(U32) | \ref Data::mBloodLeakDetect | + * | #07:(F32) | \ref Data::mBloodLeakIntensityMvgAvg | + * | #08:(F32) | \ref Data::mBloodLeakTimeSinceZeroMS | + * | #09:(F32) | \ref Data::mBloodLeakDrfitInRangeStatus | + * | #10:(F32) | \ref Data::mBloodLeakDriftUpperRangeStatus | * * \sa Data * @@ -67,16 +67,16 @@ QVariantList parameters() const override; struct { - Types::U32 mBloodLeakStatus ; - Types::U32 mBloodLeakState ; - Types::U32 mBloodLeakZeroStatusCounter ; - Types::U32 mBloodLeakCounter ; - Types::U32 mBloodLeakZeroedStatus ; - Types::U32 mBloodLeakDetectSetPoint ; - Types::U32 mBloodLeakDetectLevel ; - Types::U32 mBloodLeakStatusCount ; - Types::U32 mBloodLeakLEDIntensity ; - Types::U32 mBloodLeakRegisterCounter ; + Types::U32 mBloodLeakStatus ; + Types::U32 mBloodLeakState ; + Types::U32 mBloodLeakPersistentCounter ; + Types::U32 mBloodLeakSerialCommState ; + Types::U32 mBloodLeakIntensity ; + Types::U32 mBloodLeakDetect ; + Types::F32 mBloodLeakIntensityMvgAvg ; + Types::U32 mBloodLeakTimeSinceZeroMS ; + Types::U32 mBloodLeakDrfitInRangeStatus ; + Types::U32 mBloodLeakDriftUpperRangeStatus ; } _data; public: @@ -86,17 +86,16 @@ QString infoText() const override { return QString("BloodLeak") ; } struct Data { - quint32 mBloodLeakStatus = 0; - quint32 mBloodLeakState = 0; - quint32 mBloodLeakZeroStatusCounter = 0; - quint32 mBloodLeakCounter = 0; - quint32 mBloodLeakZeroedStatus = 0; - quint32 mBloodLeakDetectSetPoint = 0; - quint32 mBloodLeakDetectLevel = 0; - quint32 mBloodLeakStatusCount = 0; - quint32 mBloodLeakLEDIntensity = 0; - quint32 mBloodLeakRegisterCounter = 0; - + quint32 mBloodLeakStatus = 0; + quint32 mBloodLeakState = 0; + quint32 mBloodLeakPersistentCounter = 0; + quint32 mBloodLeakSerialCommState = 0; + quint32 mBloodLeakIntensity = 0; + quint32 mBloodLeakDetect = 0; + float mBloodLeakIntensityMvgAvg = 0; + quint32 mBloodLeakTimeSinceLastZeroMS = 0; + quint32 mBloodLeakDriftInRangeStatus = 0; + quint32 mBloodLeakDriftUpperRangeStatus = 0; }; MHDBloodLeakData () { }