Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -rc7dcb245c2378b1c96eeaa02f120f61dff598b11 -r2205857f59dd884c4af450239381387cfb560c2e --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision c7dcb245c2378b1c96eeaa02f120f61dff598b11) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 2205857f59dd884c4af450239381387cfb560c2e) @@ -7,23 +7,23 @@ * * @file Pressure.h * -* @author (last) Vinayakam Mani -* @date (last) 04-Sep-2024 +* @author (last) Sean Nash +* @date (last) 09-Nov-2024 * -* @author (original) Vinayakam Mani -* @date (original) 04-Sep-2024 +* @author (original) Sean Nash +* @date (original) 09-Nov-2024 * ***************************************************************************/ #ifndef __PRESSURE_H__ #define __PRESSURE_H__ -#include "DDCommon.h" +#include "ROCommon.h" #include "PressureSensor.h" /** * @defgroup Pressure Pressure - * @brief Pressure sensors monitor module. Monitors the various DD pressure + * @brief Pressure sensors monitor unit. Monitors the various RO pressure * sensors. * * @addtogroup Pressure @@ -35,34 +35,26 @@ /// 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 filteredWaterInletInputPressure; ///< Water Inlet Input pressure (P8 PC2o) + F32 filteredWaterInletOutputPressure; ///< Water Inlet Output pressure (P13 PPo) + F32 filteredWaterOutletPressure; ///< Water Outlet pressure (P17 PMp) 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 filteredWaterOutletTemp; ///< Water Outlet temperature } PRESSURE_TEMP_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 ); +//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 ); /**@}*/