Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r19e7bd61fff3d243caecd59e83dd4b1782fa6621 -r97a3e2ca15b28aef843b1dee750d5a911afb0a18
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 19e7bd61fff3d243caecd59e83dd4b1782fa6621)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 97a3e2ca15b28aef843b1dee750d5a911afb0a18)
@@ -125,7 +125,7 @@
 void calculateRinsePumpSpeed( void )
 {
     // Pulse width in 10us resolution
-    U16 pumpPulseWidth      = 0; //getFPGAD79RinsePumpSpeed(); // TODO ucomment
+    U16 pumpPulseWidth      = getFPGAD79RinsePumpSpeed();
     U32 pumpSpeedPerSec     = US_PER_SECOND / ( pumpPulseWidth * RINSE_PUMP_PWM_PULSE_RESOLUTION_US );
 
     //Speed in RPM
@@ -246,9 +246,9 @@
     {
         RINSE_PUMP_PAYLOAD_T data;
 
-        data.d79State       = getRinsePumpState();
-        data.d79PumpPWM     = getF32OverrideValue( &rinsePumpPwmPercentage );
-        data.d79PumpRPM     = rinsePumpMeasuredSpeed;
+        data.d79State   = getRinsePumpState();
+        data.d79PumpPWM = getF32OverrideValue( &rinsePumpPwmPercentage );
+        data.d79PumpRPM = rinsePumpMeasuredSpeed;
 
         broadcastData( MSG_ID_DD_RINSE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( RINSE_PUMP_PAYLOAD_T ) );
         rinsePumpDataPublicationTimerCounter = 0;
@@ -309,23 +309,26 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( TRUE == isTestingActivated() )
     {
-        U32 rinsePumpOnOff;
-        RINSE_PUMP_STATE_T rinsePumpState;
+        if ( message->hdr.payloadLen == sizeof( U32 ) )
+        {
+            U32 rinsePumpOnOff;
+            RINSE_PUMP_STATE_T rinsePumpState;
 
-        U08* payloadPtr = message->payload;
+            U08* payloadPtr = message->payload;
 
-        memcpy( &rinsePumpOnOff, payloadPtr, sizeof( U32 ) );
+            memcpy( &rinsePumpOnOff, payloadPtr, sizeof( U32 ) );
 
-        if ( ( OFF == rinsePumpOnOff ) || ( ON == rinsePumpOnOff ) )
-        {
-            // Only On or Off requests are accepted
-            rinsePumpState = ( OFF == rinsePumpOnOff ? RINSE_PUMP_STATE_OFF : RINSE_PUMP_STATE_ON );
+            if ( ( OFF == rinsePumpOnOff ) || ( ON == rinsePumpOnOff ) )
+            {
+                // Only On or Off requests are accepted
+                rinsePumpState = ( OFF == rinsePumpOnOff ? RINSE_PUMP_STATE_OFF : RINSE_PUMP_STATE_ON );
 
-            setRinsePumpState( rinsePumpState );
+                setRinsePumpState( rinsePumpState );
 
-            result = TRUE;
+                result = TRUE;
+            }
         }
     }