Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rd8cd7de2f84b26aafc153e2bb665a5058a040bf0 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 2205857f59dd884c4af450239381387cfb560c2e) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision d8cd7de2f84b26aafc153e2bb665a5058a040bf0) @@ -8,10 +8,10 @@ * @file PressureSensor.h * * @author (last) Sean Nash -* @date (last) 09-Nov-2024 +* @date (last) 18-Nov-2024 * * @author (original) Sean Nash -* @date (original) 09-Nov-2024 +* @date (original) 18-Nov-2024 * ***************************************************************************/ @@ -32,29 +32,31 @@ // ********** public definitions ********** -/// Enumeration of pressure sensors monitored by this module. +/// Enumeration of pressure sensors monitored by this unit. 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_WATER_OUTLET, ///< Hydraulics outlet pressure (PHo/Pn) + PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0, ///< Water inlet pressure before regulator (PRi) + PRESSURE_SENSOR_FIRST = PRESSURE_SENSOR_WATER_INLET_PRE_REG, ///< First pressure to scan + PRESSURE_SENSOR_WATER_INLET_POST_REG, ///< Water inlet pressure after regulator (PRo) + PRESSURE_SENSOR_WATER_INLET_PRE_COND, ///< Water inlet pressure before conductivity sensor (PC2o) + PRESSURE_SENSOR_PRE_RO_FILTER, ///< Pressure before RO filter (PPo) + PRESSURE_SENSOR_POST_RO_FILTER, ///< Pressure after RO filter (PMp) 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 ); -//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 ); +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 ); /**@}*/