Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -r48c75a394c56b82886760e9a136b638edecf7572 -red39129abdca4ec343369d83494530b23621e052 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 48c75a394c56b82886760e9a136b638edecf7572) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision ed39129abdca4ec343369d83494530b23621e052) @@ -14,42 +14,42 @@ * @date (original) 04-Sep-2024 * ***************************************************************************/ - -#ifndef __PRESSURE_SENSOR_H__ -#define __PRESSURE_SENSOR_H__ - + +#ifndef __PRESSURE_SENSOR_H__ +#define __PRESSURE_SENSOR_H__ + #include "DDCommon.h" -#include "PressureCommon.h" - -/** - * @defgroup PressureSensor PressureSensor - * @brief Pressure sensors driver module. Reads the various DD pressure - * sensors raw pressure and temperature value. - * - * @addtogroup PressureSensor - * @{ - */ - +#include "PressureCommon.h" + +/** + * @defgroup PressureSensor PressureSensor + * @brief Pressure sensors driver module. Reads the various DD pressure + * sensors raw pressure and temperature value. + * + * @addtogroup PressureSensor + * @{ + */ + // ********** public definitions ********** - -/// Enumeration of pressure sensors monitored by this module. -typedef enum PressureSensors -{ - PRESSURE_SENSOR_WATER_INLET_INPUT = 0, ///< Water Inlet pressure before regulator (PRi) - PRESSURE_SENSOR_FIRST = PRESSURE_SENSOR_WATER_INLET_INPUT, ///< First pressure to scan - PRESSURE_SENSOR_WATER_INLET_OUTPUT, ///< Water Inlet pressure after regulator (PRo) - PRESSURE_SENSOR_HYDRAULICS_OUTLET, ///< Hydraulics outlet pressure (PHo/Pn) - PRESSURE_SENSOR_BIBAG, ///< Dry Bicarb pressure (PDB/PCb) - PRESSURE_SENSOR_SPENT_DIALYSATE, ///< Spent Dialysate pressure (PDs) - PRESSURE_SENSOR_FRESH_DIALYSATE, ///< Fresh Dialysate pressure (PDf) - PRESSURE_SENSOR_TRANSMEMBRANE, ///< Transmembrane pressure (Ptm) - PRESSURE_SENSOR_BAROMETRIC, ///< barometric pressure sensor - NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors -} PRESSURE_SENSORS_T; - -// ********** public function prototypes ********** - -void initPressureSensor( void ); + +/// Enumeration of pressure sensors monitored by this module. +typedef enum PressureSensors +{ + M1_PRES = 0, ///< Water Inlet pressure before regulator (PRi) + PRESSURE_SENSOR_FIRST = M1_PRES, ///< First pressure to scan + M3_PRES, ///< Water Inlet pressure after regulator (PRo) + D9_PRES, ///< Hydraulics outlet pressure (PHo/Pn) + D66_PRES, ///< Dry Bicarb pressure (PDB/PCb) + D51_PRES, ///< Spent Dialysate pressure (PDs) + D18_PRES, ///< Fresh Dialysate pressure (PDf) + D41_PRES, ///< Transmembrane pressure (Ptm) + BARO_PRES, ///< barometric pressure sensor + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors +} PRESSURE_SENSORS_T; + +// ********** public function prototypes ********** + +void initPressureSensor( void ); void readPressureSensors( void ); F32 getPressure( PRESSURE_SENSORS_T sensor ); F32 getPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); @@ -59,8 +59,8 @@ BOOL testPressureSensorReadingsOverride( MESSAGE_T *message ); BOOL testPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); BOOL testPressureSensorReadCounterOverride( MESSAGE_T *message ); -BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ); - -/**@}*/ - -#endif +BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ); + +/**@}*/ + +#endif