Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r21aec35b34a19514e0e00e8596e9884916ab91f1
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 24e6e4df038de04e13363d1eb929b4fd693046ff)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 21aec35b34a19514e0e00e8596e9884916ab91f1)
@@ -55,8 +55,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.05F                                       ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.25F                                       ///< P term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.25F                                       ///< 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.
 
@@ -233,7 +233,7 @@
             // For now maximum allowed pressure is inserted into the target pressure override
             // if the target flow rate exceeded the max pressure, it will set the maximum pressure
             targetROPumpMaxPressure = maxPressure;
-            targetROPumpFlowRateLPM    = roFlowRate;
+            targetROPumpFlowRateLPM = roFlowRate;
             roPumpControlMode       = PUMP_CONTROL_MODE_CLOSED_LOOP;
             roPumpState             = RO_PUMP_RAMP_UP_TO_TARGET_FLOW_STATE;
             // Get the initial guess of the duty cycle
@@ -315,7 +315,7 @@
 void signalROPumpHardStop( void )
 {
     stopROPump();
-    targetROPumpFlowRateLPM          = 0;
+    targetROPumpFlowRateLPM       = 0;
     roPumpState                   = RO_PUMP_OFF_STATE;
     roPumpPWMDutyCyclePct         = 0.0;
     roPumpOpenLoopTargetDutyCycle = 0.0;
@@ -375,12 +375,11 @@
         measuredROFlowRateLPM.data              = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
                                                          ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
-       // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that
-       // the flow is 0.
-       if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
-       {
-          measuredROFlowRateLPM.data = 0.0;
-       }
+        // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
+        if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
+        {
+            measuredROFlowRateLPM.data = 0.0;
+        }
 
         measuredFlowReadingsSum = 0;
         flowFilterCounter       = 0;
@@ -412,6 +411,7 @@
             BOOL isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlow > targetFlow ) ? TRUE : FALSE );
             BOOL isFlowOutOfLowerRange = ( isFlowOutOfRange && ( currentFlow < targetFlow ) ? TRUE : FALSE );
 
+
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
         }
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r21aec35b34a19514e0e00e8596e9884916ab91f1
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 24e6e4df038de04e13363d1eb929b4fd693046ff)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 21aec35b34a19514e0e00e8596e9884916ab91f1)
@@ -292,9 +292,6 @@
     // Persistent alarm for the temperature sensors range check
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
 
-    // Persistent alarm for the temperature sensors range check
-    initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
-
     // Persistent alarm for the temperature sensors error bit fault check
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS );
 
@@ -711,11 +708,6 @@
 
     tempSensors[ sensorIndex ].fpgaErrorStatus = ( ( FALSE == isFPGACountChanging ) || ( FALSE == isFPGAErrorZero ) ? TRUE : FALSE );
 
-    for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; i++ )
-    {
-        // Loop through all the sensors and read their FPGA error status
-        isTemperatureNotValid |= tempSensors[ sensorIndex ].fpgaErrorStatus;
-    }
 #ifndef DISABLE_FPGA_ALARMS_UNTIL_THE_NEW_PERSISTENT
     checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT, isTemperatureNotValid, sensorIndex, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r21aec35b34a19514e0e00e8596e9884916ab91f1
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 24e6e4df038de04e13363d1eb929b4fd693046ff)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 21aec35b34a19514e0e00e8596e9884916ab91f1)
@@ -84,7 +84,7 @@
 #define FPGA_FLUIDLEAK_STATE_MASK       0x0004                  ///< Bit mask for fluid leak detector.
 
 #define CONCENTRATE_CAP_SWITCH_MASK     0x10                    ///< Concentrate cap switch bit mask
-#define DIALYSATE_CAP_SWITCH_MASK       0x20                    ///< Dialysate cap switch bit mask..
+#define DIALYSATE_CAP_SWITCH_MASK       0x20                    ///< Dialysate cap switch bit mask.
 #define FPGA_POWER_OUT_TIMEOUT_MS       ( 2 * MS_PER_SECOND )   ///< FPGA power out timeout in milliseconds.
 #define FPGA_GPIO_POWER_STATUS_PIN      7                       ///< FPGA GPIO power status pin.
 #define FPGA_READ_V3_START_BYTE_NUM     156                     ///< FPGA V3 read sensors start byte number.