Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r5b9567251996d5962a742fe7a3813b9badb28ec7 -r4dec0c9686a7777e563fb464a64c182e4ce7982f
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5b9567251996d5962a742fe7a3813b9badb28ec7)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4dec0c9686a7777e563fb464a64c182e4ce7982f)
@@ -655,6 +655,7 @@
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+    BOOL result = FALSE;
 //    BOOL result = FALSE;
     // reset target pressure override
     if ( ( ovType == OVERRIDE_RESET_OVERRIDE ) && ( targetROPumpPressure.override != OVERRIDE_RESET ) )
@@ -711,7 +712,7 @@
             }
         }
     }
-    BOOL result = setROPumpTargetPressure(getTargetROPumpPressure());
+    result = setROPumpTargetPressure(getTargetROPumpPressure());
 
     return result;
 }
@@ -730,6 +731,7 @@
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+    BOOL result = FALSE;
     // reset target flow rate override
     if ( ( ovType == OVERRIDE_RESET_OVERRIDE ) && ( targetROPumpFlowRate.override != OVERRIDE_RESET ) )
     {
@@ -785,7 +787,7 @@
             }
         }
     }
-    BOOL result = setROPumpTargetFlowRateMLPM(getTargetROPumpFlowRateMLPM());
+    result = setROPumpTargetFlowRateMLPM(getTargetROPumpFlowRateMLPM());
 
     return result;
 }
@@ -804,6 +806,7 @@
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload );
+    BOOL result = FALSE;
     // reset target duty cycle override
     if ( ( ovType == OVERRIDE_RESET_OVERRIDE ) && ( roPumpOpenLoopTargetDutyCycle.override != OVERRIDE_RESET ) )
     {
@@ -859,7 +862,7 @@
             }
         }
     }
-    BOOL result = setROPumpTargetDutyCycle(getTargetROPumpDutyCyclePCT());
+    result = setROPumpTargetDutyCycle(getTargetROPumpDutyCyclePCT());
 
     return result;
 }