Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r9826fc85bd1497ec617ae0e825f78b91972de2b3 -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 9826fc85bd1497ec617ae0e825f78b91972de2b3)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d)
@@ -181,6 +181,17 @@
                             NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
     }
 
+    calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1_ACID,   getFPGACP1HallSensePulseWidth() );
+    calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2_BICARB, getFPGACP2HallSensePulseWidth() );
+
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        monitorPumpSpeed( CONCENTRATEPUMPS_CP1_ACID,   ALARM_ID_CP1_SPEED_CONTROL_ERROR );
+        monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_CP2_SPEED_CONTROL_ERROR );
+    }
+
     if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) )
     {
         CONCENTRATE_PUMP_DATA_T data;
@@ -191,9 +202,6 @@
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, fpgaConcentratePumpsFault );
         }
 
-        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1_ACID,   getFPGACP1HallSensePulseWidth() );
-        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2_BICARB, getFPGACP2HallSensePulseWidth() );
-
         U08 cp1Direction        = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].direction;
         F32 cp1SetSpeed         = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
         F32 cp1Speed            = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
@@ -211,14 +219,6 @@
         data.cp1PulseUS         = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].pulseWidthUS;
         data.cp2PulseUS         = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pulseWidthUS;
 
-#ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-        {
-            monitorPumpSpeed( CONCENTRATEPUMPS_CP1_ACID,   ALARM_ID_CP1_SPEED_CONTROL_ERROR );
-            monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_CP2_SPEED_CONTROL_ERROR );
-        }
-
         concentratePumpMonitorTimerCounter = 0;
         broadcastData( MSG_ID_DG_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) );
     }