Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -ra3988128df0950e1f03dcb4a5aa53336d8fb3a6f -rce66580e076bffa157868ff7e422556f78a95cac --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision a3988128df0950e1f03dcb4a5aa53336d8fb3a6f) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision ce66580e076bffa157868ff7e422556f78a95cac) @@ -14,22 +14,22 @@ * @date (original) 09-Nov-2024 * ***************************************************************************/ - -#ifndef __PRESSURE_H__ -#define __PRESSURE_H__ - + +#ifndef __PRESSURE_H__ +#define __PRESSURE_H__ + #include "ROCommon.h" -#include "PressureSensor.h" - -/** - * @defgroup Pressure Pressure - * @brief Pressure sensors monitor unit. Monitors the various RO pressure - * sensors. - * - * @addtogroup Pressure - * @{ - */ - +#include "PressureSensor.h" + +/** + * @defgroup Pressure Pressure + * @brief Pressure sensors monitor unit. Monitors the various RO pressure + * sensors. + * + * @addtogroup Pressure + * @{ + */ + // ********** public definitions ********** /// Pressure data struct. @@ -40,16 +40,18 @@ F32 PressurePC2o; ///< Pressure before inlet conductivity sensor (P8 PC2o) F32 PressurePPo; ///< Pressure before RO filter (P13 PPo) F32 PressurePMp; ///< Pressure after RO filter (P17 PMp) + F32 PressurePPi; ///< Pressure before RO pump (X1 PPi) F32 TempPRi; ///< Temperature before pressure regulator (M1 PRi) F32 TempPRo; ///< Temperature after pressure regulator (M3 PRo) F32 TempPC2o; ///< Temperature before inlet conductivity sensor (P8 PC2o) F32 TempPPo; ///< Temperature before RO filter (P13 PPo) F32 TempPMp; ///< Temperature after RO filter (P17 PMp) + F32 TempPPi; ///< Temperature before RO pump (X1 PPi) } PRESSURE_TEMP_DATA_T; - -// ********** public function prototypes ********** - -void initPressure( void ); + +// ********** public function prototypes ********** + +void initPressure( void ); void execPressureSensor( void ); //void checkInletWaterPressure( void ); @@ -58,8 +60,8 @@ BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); //BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -//BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); - -/**@}*/ - -#endif +//BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); + +/**@}*/ + +#endif