Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -reea0132d751dfd21ef8ae0212ebed184fb2528ff -r9426334142cbfdea9ee99e3040fc08ff0247da7b
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 9426334142cbfdea9ee99e3040fc08ff0247da7b)
@@ -29,7 +29,8 @@
 #include "TaskPriority.h"
 #include "TemperatureSensors.h"
 #include "Timers.h"
-#include "Utilities.h"
+#include "Utilities.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup DGPressures
@@ -55,9 +56,12 @@
 #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        25.0F                                           ///< Maximum allowed low pressure value.
-#define MIN_INLET_WATER_PRESSURE_WARNING_LOW        28.0F                                           ///< Minimum allowed low pressure value.
+#define MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG   14.0F                                           ///< Maximum allowed low pressure value in psig.
+#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG   30.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.
+
 #define INLET_WATER_PRESSURE_PERSISTENCE_PERIOD     ( 5 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range error.
 #define PRESSURE_OUT_OF_RANGE_TIMEOUT_MS            ( 5 * MS_PER_SECOND )                           ///< Pressure out of range persistence period in milliseconds.
 #define PRESSURES_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Interval (ms/task time) at which the pressures data is published on the CAN bus.
@@ -147,8 +151,11 @@
     }
 
     initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_BARO_PRESSURE_OUT_OF_RANGE, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
 }
 
 /*********************************************************************//**
@@ -165,18 +172,39 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        F32 pressure          = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
-        BOOL isPressureTooLow = ( pressure < MAX_INLET_WATER_PRESSURE_WARNING_LOW ? TRUE : FALSE );
+        DG_OP_MODE_T opMode    = getCurrentOperationMode();
+        F32 pressure           = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
+        BOOL isPressureTooLow  = ( pressure < MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ? TRUE : FALSE );
+        BOOL isPressureTooHigh = ( pressure > MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? TRUE : FALSE );
 
-        // Alarm per PRS 401
-        if ( TRUE == isPressureTooLow )
+        switch( opMode )
         {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW );
+            case DG_MODE_GENE:
+            case DG_MODE_FILL:
+            case DG_MODE_DRAI:
+                isPressureTooHigh = ( pressure <= MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? FALSE : TRUE );
+                isPressureTooLow  = ( pressure >= MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ? FALSE : TRUE );
+                // Per PRS 841
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+                // Per PRS 401
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+                break;
+
+            // TODO add chem flush and heat disinfect cooling modes once they are created
+            case DG_MODE_INIT:
+            case DG_MODE_STAN:
+            case DG_MODE_FLUS:
+            case DG_MODE_HEAT:
+            case DG_MODE_CHEM:
+                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 );
+                    // TODO define the PRS
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+                }
+                break;
         }
-        else
-        {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW );
-        }
     }
 }