Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -rc07917caced76b53a0ed8f35167fac6f9d8310a4 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision c07917caced76b53a0ed8f35167fac6f9d8310a4) @@ -1,69 +1,72 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2025 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 Pressure.h * -* @author (last) Vinayakam Mani -* @date (last) 04-Sep-2024 +* @author (last) “rkallala” +* @date (last) 23-Oct-2025 * * @author (original) Vinayakam Mani -* @date (original) 04-Sep-2024 +* @date (original) 12-Sep-2024 * ***************************************************************************/ - -#ifndef __PRESSURE_H__ -#define __PRESSURE_H__ - + +#ifndef __PRESSURE_H__ +#define __PRESSURE_H__ + #include "DDCommon.h" -#include "PressureSensor.h" - -/** - * @defgroup Pressure Pressure - * @brief Pressure sensors monitor module. Monitors the various DD pressure - * sensors. - * - * @addtogroup Pressure - * @{ - */ - +#include "PressureSensor.h" + +/** + * @defgroup Pressure Pressure + * @brief Pressure sensors monitor module. Monitors the various DD pressure + * sensors. + * + * @addtogroup Pressure + * @{ + */ + // ********** public definitions ********** -/// Pressure data struct. +/// DD Pressure data struct. typedef struct { - F32 m1Pressure; ///< Water Inlet Input pressure - F32 m3Pressure; ///< Water Inlet Output pressure F32 d9Pressure; ///< Hydraulics outlet pressure F32 d66Pressure; ///< Bicarb bag pressure F32 d51Pressure; ///< Spent Dialysate pressure F32 d18Pressure; ///< Fresh Dialysate pressure F32 d41Pressure; ///< Transmembrane pressure - F32 m1PresTemp; ///< Water Inlet Input temperature - F32 m3PresTemp; ///< Water Inlet Output temperature - 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 -} PRESSURE_TEMP_DATA_T; - -// ********** public function prototypes ********** - -void initPressure( void ); +} PRESSURE_DD_DATA_T; + +/// FP Pressure data struct. +typedef struct +{ + F32 m3Pressure; ///< Water Inlet Output pressure + F32 p8Pressure; ///< Pressure before inlet conductivity sensor (P8) + F32 p13Pressure; ///< Pressure before RO filter (P13) + F32 p17Pressure; ///< Pressure after RO filter (P17) + F32 p46Pressure; ///< Pressure after sediment filter (P46) +} PRESSURE_FP_DATA_T; + +// ********** public function prototypes ********** + +void initPressure( void ); void execPressureSensor( void ); -void checkInletWaterPressure( void ); F32 getFilteredPressure( PRESSURE_SENSORS_T sensor ); F32 getFilteredPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); -BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); - -/**@}*/ - -#endif +BOOL testDDPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); + +/**@}*/ + +#endif