Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -red39129abdca4ec343369d83494530b23621e052 -r50144ec3e96785cf76d5bfd22ee65029c82e732b --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision ed39129abdca4ec343369d83494530b23621e052) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.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 PressureSensor.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 * ***************************************************************************/ @@ -35,15 +35,23 @@ /// 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) + D9_PRES = 0, ///< Hydraulics outlet pressure (PHo/Pn) + FIRST_DD_PRESSURE_SENSOR = D9_PRES, ///< Start of DD pressure sensor group 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 + D87_PRES, ///< Dialysate pressure + LAST_DD_PRESSURE_SENSOR = D87_PRES, ///< End of DD pressure sensor group + M3_PRES, ///< Water inlet pressure after regulator (PR0) + FIRST_IO_PRESSURE_SENSOR = M3_PRES, ///< Start of IO pressure sensor group + LAST_IO_PRESSURE_SENSOR = M3_PRES, ///< End of IO pressure sensor group + P8_PRES, ///< Water inlet pressure before conductivity sensor + FIRST_FP_PRESSURE_SENSOR = P8_PRES, ///< Start of FP pressure sensor group + P13_PRES, ///< Pressure before RO filter + P17_PRES, ///< Pressure after RO filter + P46_PRES, ///< Pressure after sediment filter + LAST_FP_PRESSURE_SENSOR = P46_PRES, ///< End of FP pressure sensor group NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors } PRESSURE_SENSORS_T; @@ -53,13 +61,11 @@ void readPressureSensors( void ); F32 getPressure( PRESSURE_SENSORS_T sensor ); F32 getPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); -U32 getPressureSensorReadCount( PRESSURE_SENSORS_T sensor ); -U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor ); -BOOL testPressureSensorReadingsOverride( MESSAGE_T *message ); -BOOL testPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); -BOOL testPressureSensorReadCounterOverride( MESSAGE_T *message ); -BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorReadingsOverride( MESSAGE_T *message ); +BOOL testDDPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/