Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rf724589acaa51725f5e5f8a746404d01804efbcf --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision f724589acaa51725f5e5f8a746404d01804efbcf) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-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 MDGTemperaturesData.h - * \author (last) Behrouz NematiPour - * \date (last) 10-Mar-2022 + * \author (last) Dara Navaei + * \date (last) 05-Feb-2024 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -49,6 +49,16 @@ * | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction | * | #12:(F32) | \ref Data::mPrimaryHeaterInternal | * | #13:(F32) | \ref Data::mTrimmerHeaterInternal | + * | #14:(F32) | \ref Data::mFpgaBoard | + * | #15:(F32) | \ref Data::mLoadCellA1B1 | + * | #16:(F32) | \ref Data::mLoadCellA2B2 | + * | #17:(F32) | \ref Data::mInternalTHDORTD | + * | #18:(F32) | \ref Data::mInternalTDIRTD | + * | #19:(F32) | \ref Data::mInteralTHDRTD | + * | #20:(F32) | \ref Data::mInternalCondSnsrTemp | + * | #21:(F32) | \ref Data::mBaroTempSensor | + * | #22:(F32) | \ref Data::mDialysateInletMvngAvg | + * | #23:(F32) | \ref Data::mRedundantOutletMvngAvg | * * \sa Data * @@ -72,19 +82,29 @@ QVariantList parameters() const override; struct { - Types::F32 mInletPrimaryHeater ; /* 01 */ - Types::F32 mHeatDisinfect ; /* 02 */ - Types::F32 mOutletPrimaryHeater ; /* 03 */ - Types::F32 mConductivitySensor1 ; /* 04 */ - Types::F32 mConductivitySensor2 ; /* 05 */ - Types::F32 mOutletRedundancy ; /* 06 */ - Types::F32 mInletDialysate ; /* 07 */ - Types::F32 mPrimaryHeaterThermoCouple ; /* 08 */ - Types::F32 mTrimmerHeaterThermoCouple ; /* 09 */ - Types::F32 mPrimaryHeaterColdJunction ; /* 10 */ - Types::F32 mTrimmerHeaterColdJunction ; /* 11 */ - Types::F32 mPrimaryHeaterInternal ; /* 12 */ - Types::F32 mTrimmerHeaterInternal ; /* 13 */ + Types::F32 mInletPrimaryHeater ; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) + Types::F32 mHeatDisinfect ; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) + Types::F32 mOutletPrimaryHeater ; ///< Trimmer heater cold junction temperature sensor + Types::F32 mConductivitySensor1 ; ///< Primary heaters cold junction temperature sensor + Types::F32 mConductivitySensor2 ; ///< Trimmer heater thermocouple sensor + Types::F32 mOutletRedundancy ; ///< Primary heaters thermocouple sensor + Types::F32 mInletDialysate ; ///< Inlet dialysate temperature sensor + Types::F32 mPrimaryHeaterThermoCouple ; ///< Outlet redundant temperature sensor + Types::F32 mTrimmerHeaterThermoCouple ; ///< Conductivity sensor 2 temperature sensor + Types::F32 mPrimaryHeaterColdJunction ; ///< Conductivity sensor 1 temperature sensor + Types::F32 mTrimmerHeaterColdJunction ; ///< Outlet primary heater temperature sensor + Types::F32 mPrimaryHeaterInternal ; ///< Heat Disinfect temperature sensor + Types::F32 mTrimmerHeaterInternal ; ///< Inlet primary heater temperature sensor + Types::F32 mFpgaBoard ; ///< FPGA board temperature sensor + Types::F32 mLoadCellA1B1 ; ///< Load cell A1/B1 temperature sensor + Types::F32 mLoadCellA2B2 ; ///< Load cell A2/B2 temperature sensor + Types::F32 mInternalTHDORTD ; ///< THDo RTD channel temperature sensor + Types::F32 mInternalTDIRTD ; ///< TDI RTD channel temperature sensor + Types::F32 mInteralTHDRTD ; ///< THd RTD channel temperature sensor + Types::F32 mInternalCondSnsrTemp ; ///< Conductivity Sensor internal temperature sensor + Types::F32 mBaroTempSensor ; ///< Barometric temperature sensor + Types::F32 mDialysateInletMvngAvg ; ///< Dialysate inlet moving average + Types::F32 mRedundantOutletMvngAvg ; ///< Redundant outlet moving average } _data; public: @@ -94,19 +114,29 @@ QString infoText () const override { return QString("Temperatures"); } struct Data { - float mInletPrimaryHeater = 0; ///< Inlet primary heaters temperature - float mHeatDisinfect = 0; ///< Heat Disinfect temperature - float mOutletPrimaryHeater = 0; ///< Outlet primary heaters temperature - float mConductivitySensor1 = 0; ///< Conductivity sensor 1 temperature - float mConductivitySensor2 = 0; ///< Conductivity sensor 2 temperature - float mOutletRedundancy = 0; ///< Outlet redundancy temperature - float mInletDialysate = 0; ///< Inlet dialysate temperature - float mPrimaryHeaterThermoCouple = 0; ///< Primary heaters internal temperature - float mTrimmerHeaterThermoCouple = 0; ///< Trimmer heater internal temperature - float mPrimaryHeaterColdJunction = 0; ///< Primary heaters cold junction temperature - float mTrimmerHeaterColdJunction = 0; ///< Trimmer heater cold junction temperature - float mPrimaryHeaterInternal = 0; ///< Primary heaters internal temperature - float mTrimmerHeaterInternal = 0; ///< Trimmer heater internal temperature + float mInletPrimaryHeater = 0; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) + float mHeatDisinfect = 0; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) + float mOutletPrimaryHeater = 0; ///< Trimmer heater cold junction temperature sensor + float mConductivitySensor1 = 0; ///< Primary heaters cold junction temperature sensor + float mConductivitySensor2 = 0; ///< Trimmer heater thermocouple sensor + float mOutletRedundancy = 0; ///< Primary heaters thermocouple sensor + float mInletDialysate = 0; ///< Inlet dialysate temperature sensor + float mPrimaryHeaterThermoCouple = 0; ///< Outlet redundant temperature sensor + float mTrimmerHeaterThermoCouple = 0; ///< Conductivity sensor 2 temperature sensor + float mPrimaryHeaterColdJunction = 0; ///< Conductivity sensor 1 temperature sensor + float mTrimmerHeaterColdJunction = 0; ///< Outlet primary heater temperature sensor + float mPrimaryHeaterInternal = 0; ///< Heat Disinfect temperature sensor + float mTrimmerHeaterInternal = 0; ///< Inlet primary heater temperature sensor + float mFpgaBoard = 0; ///< FPGA board temperature sensor + float mLoadCellA1B1 = 0; ///< Load cell A1/B1 temperature sensor + float mLoadCellA2B2 = 0; ///< Load cell A2/B2 temperature sensor + float mInternalTHDORTD = 0; ///< THDo RTD channel temperature sensor + float mInternalTDIRTD = 0; ///< TDI RTD channel temperature sensor + float mInteralTHDRTD = 0; ///< THd RTD channel temperature sensor + float mInternalCondSnsrTemp = 0; ///< Conductivity Sensor internal temperature sensor + float mBaroTempSensor = 0; ///< Barometric temperature sensor + float mDialysateInletMvngAvg = 0; ///< Dialysate inlet moving average + float mRedundantOutletMvngAvg = 0; ///< Redundant outlet moving average }; MDGTemperatures() { }