Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r1781335a8c1833fad17b275bf44c7f6675e68423 -r50144ec3e96785cf76d5bfd22ee65029c82e732b --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 1781335a8c1833fad17b275bf44c7f6675e68423) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 50144ec3e96785cf76d5bfd22ee65029c82e732b) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 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 Temperature.h * -* @author (last) Vinayakam Mani -* @date (last) 23-Sep-2024 +* @author (last) Varshini Nagabooshanam +* @date (last) 27-Jan-2026 * * @author (original) Vinayakam Mani -* @date (original) 23-Sep-2024 +* @date (original) 25-Sep-2024 * ***************************************************************************/ @@ -35,23 +35,46 @@ typedef struct { F32 d1Temp; ///< Inlet heat exchanger temperature sensor - F32 x6Temp; ///< Outlet heat exchanger temperature sensor + F32 d78Temp; ///< Outlet heat exchanger temperature sensor F32 d4Temp; ///< Hydraulics primary heater temperature sensor F32 d50Temp; ///< Trimmer heater temperature sensor + F32 d99Temp; ///< Fresh dialysate temperature sensor F32 boardTemp; ///< Board temperature sensor - F32 baroTemp; ///< Barometric temperature sensor F32 d16CondTemp; ///< D16 temperature value F32 d28CondTemp; ///< D28 temperature value F32 d30CondTemp; ///< D30 temperature value F32 d44CondTemp; ///< D44 temperature value F32 d75CondTemp; ///< D75 temperature value F32 d4AvgTemp; ///< D4 moving average temperature value F32 d50AvgTemp; ///< D50 moving average temperature value + F32 d99AvgTemp; ///< D99 moving average temperature value F32 d28AvgTemp; ///< D28 moving average temperature value F32 d30AvgTemp; ///< D30 moving average temperature value -} TEMPERATURE_SENSORS_DATA_T; + F32 d9PresTemp; ///< Hydraulics outlet pressure temperature + F32 d66PresTemp; ///< Bicarb bag temperature + F32 d51PresTemp; ///< Spent Dialysate temperature + F32 d18PresTemp; ///< Fresh Dialysate temperature + F32 d41PresTemp; ///< Transmembrane temperature + F32 d87PresTemp; ///< Dialysate temperature +} TEMPERATURE_SENSORS_DD_DATA_T; +/// Temperature sensors data structure. +typedef struct +{ + F32 m3Temp; ///< Temperature after pressure regulator (M3) + F32 p10Temp; ///< P10 temperature from inlet conductivity sensor. + F32 p19Temp; ///< P19 temperature from outlet conductivity sensor. + F32 p8Temp; ///< Temperature before inlet conductivity sensor (P8) + F32 p13Temp; ///< Temperature before RO filter (P13) + F32 p17Temp; ///< Temperature after RO filter (P17) + F32 p7Temp; ///< Temperature RO inlet + F32 p16Temp; ///< Temperature RO outlet + F32 p46Temp; ///< Temperature after sediment filter (P46) + F32 p7InternalTemp; ///< P7 internal Temperature + F32 p16InternalTemp; ///< P16 internal Temperature +} TEMPERATURE_SENSORS_FP_DATA_T; + // ********** public function prototypes ********** void initTemperature( void ); @@ -61,7 +84,8 @@ F32 getD50AverageTemperature( void ); void checkDialysateTemperatureSensors( void ); -BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testDDTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testIOFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); /**@}*/