Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r8f3e72f41465c23c5f193a6aabea9e84d718aa74 -r5379702cf2aba320cad160bef6c381c0c9138a63 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 8f3e72f41465c23c5f193a6aabea9e84d718aa74) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 5379702cf2aba320cad160bef6c381c0c9138a63) @@ -56,10 +56,10 @@ #define MIN_VALID_BARO_PRESSURE_PSIA 10.1F ///< Minimum valid barometric pressure in psia. #define MAX_VALID_BARO_PRESSURE_PSIA 15.4F ///< Maximum valid barometric pressure in psia. -#define MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 23.0F ///< Maximum allowed low pressure value in psig. -#define MAX_FLUSH_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 14.0F ///< Maximum allowed low pressure value for Flush in psig. -#define MIN_FLUSH_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 15.0F ///< Minimum allowed low pressure value for flush in psig. -#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 24.0F ///< Minimum allowed low pressure value in psig. +#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 23.0F ///< Minimum allowed low pressure value in psig. +#define MIN_FLUSH_INLET_PRESSURE_WARNING_LOW_PSIG 14.0F ///< Minimum allowed low pressure value for Flush in psig. +#define MIN_FLUSH_INLET_PRESSURE_TO_CLEAR_PSIG 15.0F ///< Minimum allowed low pressure value for flush in psig. +#define MIN_INLET_PRESSURE_TO_CLEAR_WARINING_PSIG 24.0F ///< Minimum allowed low pressure value in psig. #define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG 80.0F ///< Maximum allowed high pressure value in psig. #define MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG 78.0F ///< Minimum allowed high pressure value in psig. @@ -181,15 +181,15 @@ { BOOL isPressureTooLow; BOOL isPressureTooHigh; - F32 maxInletWaterPressureWarningLow = MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; - F32 minInletWaterPressureWarningLow = MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; + F32 maxInletWaterPressureWarningLow = MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; + F32 minInletWaterPressureWarningLow = MIN_INLET_PRESSURE_TO_CLEAR_WARINING_PSIG; DG_OP_MODE_T opMode = getCurrentOperationMode(); switch ( opMode ) { case DG_MODE_STAN: - maxInletWaterPressureWarningLow = MAX_FLUSH_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; - minInletWaterPressureWarningLow = MIN_FLUSH_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; + maxInletWaterPressureWarningLow = MIN_FLUSH_INLET_PRESSURE_WARNING_LOW_PSIG; + minInletWaterPressureWarningLow = MIN_FLUSH_INLET_PRESSURE_TO_CLEAR_PSIG; break; case DG_MODE_FLUS: @@ -203,7 +203,7 @@ // NOTE: Active cool does not have a flush drain state. if ( CLEANING_MODE_LOW_PRESSURE_STATE_NUMBER == getCurrentOperationSubMode() ) { - maxInletWaterPressureWarningLow = MAX_FLUSH_INLET_WATER_PRESSURE_WARNING_LOW_PSIG; + maxInletWaterPressureWarningLow = MIN_FLUSH_INLET_PRESSURE_WARNING_LOW_PSIG; } break; @@ -247,7 +247,7 @@ // TODO define the PRS 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 ); + checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_PRESSURE_TO_CLEAR_WARINING_PSIG ); break; default: @@ -259,10 +259,10 @@ else { // VPI is closed - clear all alarms - checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); + checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); - checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, FALSE, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); + checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, FALSE, pressure, MIN_INLET_PRESSURE_TO_CLEAR_WARINING_PSIG ); } }