Index: Common.h =================================================================== diff -u -r0dedac00a8d4dd90f373846fb184636407a32602 -r59871c9964559b5137781af9c2eeed6bab18ef73 --- Common.h (.../Common.h) (revision 0dedac00a8d4dd90f373846fb184636407a32602) +++ Common.h (.../Common.h) (revision 59871c9964559b5137781af9c2eeed6bab18ef73) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * 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 Common.h * -* @author (last) Dara Navaei -* @date (last) 30-Mar-2023 +* @author (last) Sean Nash +* @date (last) 09-Aug-2023 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -209,7 +209,7 @@ dat1.data.uInt.data = (U32)(d1); \ dat2.dataType = ALARM_DATA_TYPE_U32; \ dat2.data.uInt.data = (U32)(d2); \ - activateAlarm2Data( a, dat1, dat2 ); \ + activateAlarm2Data( a, dat1, dat2, FALSE ); \ } /// Macro to set a specific alarm with 2 pieces of floating point alarm data. @@ -220,7 +220,7 @@ dat1.data.flt.data = (F32)(d1); \ dat2.dataType = ALARM_DATA_TYPE_F32; \ dat2.data.flt.data = (F32)(d2); \ - activateAlarm2Data( a, dat1, dat2 ); \ + activateAlarm2Data( a, dat1, dat2, FALSE ); \ } /// Record structure for unsigned integer event data. @@ -350,6 +350,8 @@ F32 interalTHDRTD; ///< THd RTD channel temperature sensor F32 internalCondSnsrTemp; ///< Conductivity Sensor internal temperature sensor F32 baroTempSensor; ///< Barometric temperature sensor + F32 dialysateInletMovingAvg; ///< Dialysate inlet moving average + F32 redundantOutletMovingAvg; ///< Redundant outlet moving average } TEMPERATURE_SENSORS_DATA_T; /// Dialysate heating parameters