Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r4d7bb5dc92d934b7237391503b211f238ba0d254 -r399b9fe3684cdae76a0f1913700595d60061075f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 4d7bb5dc92d934b7237391503b211f238ba0d254)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 399b9fe3684cdae76a0f1913700595d60061075f)
@@ -890,27 +890,32 @@
  *************************************************************************/
 static void calcMeasuredPumpsSpeed( void )
 {
+    CONCENTRATE_PUMPS_T pumpId;
     U16  pulseWidthCount                    = 0;
     F32  pulseWidthInMicroSeconds           = 0.0F;
     BOOL isPulseWidthOut                    = FALSE;
-    CONCENTRATE_PUMPS_T pumpId;
     CONCENTRATE_PUMPS_T pumpInAlarm         = CONCENTRATEPUMPS_FIRST;
     F32 pumpInAlarmPulseWidthInMicroSeconds = 0.0F;
     BOOL isPumpPulseWidthOut                = FALSE;
 
     for ( pumpId = CONCENTRATEPUMPS_FIRST; pumpId < NUM_OF_CONCENTRATE_PUMPS; pumpId++ )
     {
-        switch (pumpId)
+        switch ( pumpId )
         {
             case CONCENTRATEPUMPS_CP1_ACID:
                 pulseWidthCount = getFPGACP1HallSensePulseWidth();
                 break;
+
             case CONCENTRATEPUMPS_CP2_BICARB:
                 pulseWidthCount = getFPGACP2HallSensePulseWidth();
                 break;
+
+#ifndef _VECTORCAST_
+                // Disabled in VectorCAST since it cannot be reached in VectorCAST because the switch case is in a for loop
             default:
                 // Loop only allows for valid concentrate pump Ids.
                 break;
+#endif
        }
 
         pulseWidthInMicroSeconds                = pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
@@ -928,7 +933,7 @@
         }
 
         // If pulse width is out of range capture pump out of range, pumpId and pulse width
-        if ( TRUE == isPumpPulseWidthOut)
+        if ( TRUE == isPumpPulseWidthOut )
         {
             // Pulse width for this concentrate pump is out of range
             isPulseWidthOut = TRUE;
@@ -938,7 +943,6 @@
     }
 
     checkPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, isPulseWidthOut, pumpInAlarm, pumpInAlarmPulseWidthInMicroSeconds );
-
 }
 
 /*********************************************************************//**