Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -r50144ec3e96785cf76d5bfd22ee65029c82e732b --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 67731d57db9a620418b3b848d8f75ff204902c36) +++ firmware/App/Monitors/Pressure.h (.../Pressure.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 Pressure.h * -* @author (last) Vinayakam Mani -* @date (last) 04-Sep-2024 +* @author (last) Varshini Nagabooshanam +* @date (last) 12-Jan-2026 * * @author (original) Vinayakam Mani -* @date (original) 04-Sep-2024 +* @date (original) 12-Sep-2024 * ***************************************************************************/ @@ -32,25 +32,27 @@ // ********** 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; + F32 d87Pressure; ///< Dialysate pressure +} 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 ); @@ -59,9 +61,12 @@ 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 ); +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 ); /**@}*/