Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r48c75a394c56b82886760e9a136b638edecf7572 -r313982ccc772f1bbe182877dff7e00381b04e0f4 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 48c75a394c56b82886760e9a136b638edecf7572) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) @@ -14,46 +14,46 @@ * @date (original) 04-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. typedef struct { - F32 filteredWaterInletInputPressure; ///< Water Inlet Input pressure - F32 filteredWaterInletOutputPressure; ///< Water Inlet Output pressure - F32 filteredHydraulicsOutletPressure; ///< Hydraulics outlet pressure - F32 filteredBibagPressure; ///< Bicarb bag pressure - F32 filteredSpentdialysatePressure; ///< Spent Dialysate pressure - F32 filteredFreshdialysatePressure; ///< Fresh Dialysate pressure - F32 filteredTransmembranePressure; ///< Transmembrane pressure - F32 filteredWaterInletInputTemp; ///< Water Inlet Input temperature - F32 filteredWaterInletOutputTemp; ///< Water Inlet Output temperature - F32 filteredHydraulicsOutletTemp; ///< Hydraulics outlet pressure temperature - F32 filteredBibagTemp; ///< Bicarb bag temperature - F32 filteredSpentdialysateTemp; ///< Spent Dialysate temperature - F32 filteredFreshdialysateTemp; ///< Fresh Dialysate temperature - F32 filteredTransmembraneTemp; ///< Transmembrane temperature + 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 ); + +// ********** public function prototypes ********** + +void initPressure( void ); void execPressureSensor( void ); void checkInletWaterPressure( void ); @@ -62,8 +62,8 @@ BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); - -/**@}*/ - -#endif +BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); + +/**@}*/ + +#endif