Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf724589acaa51725f5e5f8a746404d01804efbcf --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision f724589acaa51725f5e5f8a746404d01804efbcf) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 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 VDGTemperaturesData.h - * \author (last) Behrouz NemaiPour - * \date (last) 02-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file VDGTemperaturesData.h + * \author (last) Dara Navaei + * \date (last) 05-Feb-2024 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -18,9 +18,9 @@ #include // Project -#include "main.h" // Doxygen : don't remove -#include "MModel.h" +#include "main.h" // Doxygen : do not remove #include "VView.h" +#include "MDGTemperaturesData.h" // namespace namespace View { @@ -37,6 +37,7 @@ Q_OBJECT PROPERTY( float , inletPrimaryHeater , 0) + PROPERTY( float , heatDisinfect , 0) PROPERTY( float , outletPrimaryHeater , 0) PROPERTY( float , conductivitySensor1 , 0) PROPERTY( float , conductivitySensor2 , 0) @@ -48,6 +49,16 @@ PROPERTY( float , trimmerHeaterColdJunction , 0) PROPERTY( float , primaryHeaterInternal , 0) PROPERTY( float , trimmerHeaterInternal , 0) + PROPERTY( float , fpgaBoard , 0) + PROPERTY( float , loadCellA1B1 , 0) + PROPERTY( float , loadCellA2B2 , 0) + PROPERTY( float , internalTHDORTD , 0) + PROPERTY( float , internalTDIRTD , 0) + PROPERTY( float , interalTHDRTD , 0) + PROPERTY( float , internalCondSnsrTemp , 0) + PROPERTY( float , baroTempSensor , 0) + PROPERTY( float , dialysateInletMvngAvg , 0) + PROPERTY( float , redundantOutletMvngAvg , 0) VIEW_DEC(VDGTemperatures, DGTemperaturesData) };