Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3 -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -288,7 +288,6 @@
  *************************************************************************/
 BOOL isDGFaultAlarmActive( void )
 {
-
     return isAFlaultAlarmActive;
 }
 
@@ -350,6 +349,28 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+* The isAnyCleaningModeInletWaterConditionActive function returns the status
+* of any of the inlet water conditions is active or not in a cleaning mode
+* @details Inputs: none
+* @details Outputs: none
+* @return TRUE if any of the inlet water conditions is active otherwise, FALSE
+*************************************************************************/
+BOOL isAnyCleaningModeInletWaterConditionActive( void )
+{
+    BOOL status = FALSE;
+
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH );
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW );
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH );
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW );
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH );
+    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW );
+
+    return status;
+}
+
 /*************************************************************************
  * @brief
  * The alarmUserNotify function activates Fault LED and Audio if FAULT exists.
@@ -417,6 +438,7 @@
         case DG_MODE_SERV:
         case DG_MODE_CHFL:
         case DG_MODE_HCOL:
+        case DG_MODE_ROPS:
             status = FALSE;
             break;