Index: firmware/.cproject
===================================================================
diff -u -r472ba357dbc4bbbf48cd3b929c5f63347fec8b66 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/.cproject	(.../.cproject)	(revision 472ba357dbc4bbbf48cd3b929c5f63347fec8b66)
+++ firmware/.cproject	(.../.cproject)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -204,4 +204,5 @@
 			<resource resourceType="PROJECT" workspacePath="/DG"/>
 		</configuration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -650,7 +650,7 @@
 
     if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
     {
-        concentratePumps[ pumpId ].measuredPumpSpeed.data = 0.0;
+        concentratePumps[ pumpId ].measuredPumpSpeed.data = 0.0F;
     }
     else if ( FALSE == isPulseWidthOut )
     {
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -558,7 +558,7 @@
     }
 
     // Once the sensors were all checked to be out of range, check the persistent alarm
-    //checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading );
+    checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading );
 }
 
 
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -54,8 +54,8 @@
 #define ROP_CONTROL_INTERVAL                           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the RO pump is controlled.
 #define ROP_RAMP_UP_CONTROL_INTERVAL                   ( 500 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the RO pump is controlled.
 #define ROP_RAMP_UP_P_COEFFICIENT                      0.22F                                       ///< P term for RO pump ramp up to flow control.
-#define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.4F                                        ///< P term for RO pump flow control.
-#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.3F                                        ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.15F                                        ///< P term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.65F                                        ///< I term for RO pump flow control.
 #define ROP_MAX_PRESSURE_P_COEFFICIENT                 0.01F                                       ///< P term for RO pump max pressure control.
 #define ROP_MAX_PRESSURE_I_COEFFICIENT                 0.01F                                       ///< I term for RO pump max pressure control.
 
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -127,7 +127,7 @@
         valveStateMismatchCounter++; // increment valve state mismatch counter by 1
         if ( valveStateMismatchCounter > MAX_VALVE_STATE_MISMATCH_COUNT )
         {
-            activateAlarmNoData( ALARM_ID_VALVE_CONTROL_FAILURE );
+            activateAlarmNoData( ALARM_ID_DG_VALVE_CONTROL_FAILURE );
         }
     }
     else
Index: firmware/checkAlarms.sh
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -reea0132d751dfd21ef8ae0212ebed184fb2528ff
--- firmware/checkAlarms.sh	(.../checkAlarms.sh)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/checkAlarms.sh	(.../checkAlarms.sh)	(revision eea0132d751dfd21ef8ae0212ebed184fb2528ff)
@@ -21,11 +21,14 @@
 alarmRankLineNo=$(grep -n "ALARM_RANK_TABLE" ../Common/AlarmDefs.h)
 alarmRankLineNo=${alarmRankLineNo%%:*}
 
+alarmManualLineNo=$(grep -n "ALARM_MANUAL_TABLE" ../Common/AlarmDefs.h)
+alarmManualLineNo=${alarmManualLineNo%%:*}
+
 echo "
 #include <stdio.h>
 #include <stdlib.h>
-
 #define __ALARM_MGMT_C__
+#define __MANUAL_ALARMS__
 #include \"Common.h\"
 #include \"AlarmDefs.h\"
 
@@ -34,6 +37,7 @@
     ALARM_ID_T alarm;
     U32 lineNumber = $lineno;
     U32 alarmRankLineNumber = $alarmRankLineNo;
+    U32 alarmManualLineNumber = $alarmManualLineNo;
     U32 index;
 
     for ( alarm = ALARM_ID_NO_ALARM; alarm < NUM_OF_ALARM_IDS; alarm++ )
@@ -66,6 +70,17 @@
         }
     }
 
+    for ( alarm = ALARM_ID_NO_ALARM; alarm < NUM_OF_ALARM_IDS; alarm++ )
+    {
+        if ( alarm != ALARM_MANUAL_TABLE[ alarm ].alarmID )
+        {
+	    // The current alarm number is the starting line number of the ALARM_MANUAL_TABLE + 2 since the alarms enum start from 0
+            alarmManualLineNumber += alarm + 2;
+            printf(\"\\\"AlarmDefs.h\\\", line %d: error #9999: Alarm %i NOT MATCH Alarm Table ID %i!\n\", alarmManualLineNumber, alarm, ALARM_TABLE[ alarm ].alarmID);
+            exit(1);
+        }
+    }
+
     printf(\"Alarm rank table check completed!\n\");
 }" > alarmCheck.c