Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r939e488d71ae8511cba65e4a27e31660259e06ac --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 939e488d71ae8511cba65e4a27e31660259e06ac) @@ -8,7 +8,7 @@ * @file Pressures.c * * @author (last) Dara Navaei -* @date (last) 18-Jan-2023 +* @date (last) 23-Jan-2023 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -209,7 +209,7 @@ if ( VALVE_STATE_OPEN == getValveStateName( VPI ) ) { // TODO define the PRS - checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); + checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); // TODO define the PRS checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); } @@ -548,7 +548,7 @@ F32 baroPressure = getF32OverrideValue( &pressures[ PRESSURE_SENSOR_BAROMETRIC ] ); #ifndef _RELEASE_ - if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) && ( getCurrentOperationMode() != DG_MODE_INIT ) ) + if ( HW_CONFIG_BETA == getHardwareConfigStatus() ) { baroPressure = PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; } @@ -587,7 +587,8 @@ // Bitwise OR the current pressure sensor with the total pressure sensor to persistent alarm check // Remember the ID of the pressure sensor that is out of range. The ID is converted to float since the check persistent alarm function // accepts only floats. - pressureReading = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI(); + pressureReading = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI(); + if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) ) { isPressureOutOfRange = TRUE;