Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 MTreatmentOutletFlowData.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MTreatmentOutletFlowData.h + * \author (last) Dara Navaei + * \date (last) 18-Jan-2024 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 * */ #pragma once @@ -43,6 +43,12 @@ * | #5:(F32) | \ref Data::mMotorCtlSpeed | * | #6:(F32) | \ref Data::mMotorCtlCurrent | * | #7:(F32) | \ref Data::mPWMDtCycle | + * | # :(F32) | \ref Data::mDopCorrOffset | + * | # :(F32) | \ref Data::mDopCalcRate | + * | # :(F32) | \ref Data::mUfCalcRate | + * | # :(U32) | \ref Data::mRotorHall | + * | # :(F32) | \ref Data::mCurrentSetUFRate| + * | # :(U32) | \ref Data::mDialOutPumpState| * * \sa Data * @@ -69,6 +75,12 @@ Types::F32 mMotorCtlSpeed ; Types::F32 mMotorCtlCurrent ; Types::F32 mPWMDtCycle ; + Types::F32 mDopCorrOffset ; + Types::F32 mDopCalcRate ; + Types::F32 mUfCalcRate ; + Types::U32 mRotorHall ; + Types::F32 mCurrentSetUFRate ; + Types::U32 mDialOutPumpState ; } _data; public: @@ -85,6 +97,12 @@ float mMotorCtlSpeed = 0; ///< Motor Controller Speed float mMotorCtlCurrent = 0; ///< Motor Controller Current float mPWMDtCycle = 0; ///< PWM Duty Cycle in % + float mDopCorrOffset = 0; ///< + float mDopCalcRate = 0; ///< + float mUfCalcRate = 0; ///< + int mRotorHall = 0; ///< + float mCurrentSetUFRate = 0; ///< Current Set UF Rate + int mDialOutPumpState = 0; ///< Dialout pump state }; MOutletFlow () { }