Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea -ra70a78cad6ecddf3a5bc84e77b24ebc123b54161
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a70a78cad6ecddf3a5bc84e77b24ebc123b54161)
@@ -66,7 +66,7 @@
 static RINSE_PUMP_STATE_T handleRinsePumpOnState ( void );
 static void monitorRinsePumpSpeed( void );
 static void publishRinsePumpData( void );
-static void setRinsePumpPwmCount( RINSE_PUMP_ID_T pumpId, U32 pwmCount );
+static void setRinsePumpPwm( RINSE_PUMP_ID_T pumpId, F32 pwmPercent );
 
 /*********************************************************************//**
  * @brief
@@ -282,8 +282,13 @@
     }
     else
     {
-        // Set PWM count zero to stop the logical rinse pump
-        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+        F32 pwmPercent;
+
+        // Set PWM to zero to stop the logical rinse pump
+        rinsePumpPwmPercentage.data = 0.0F;
+        // PWM should be zero. Ignore the override value for rinsePumpPwmPercentage if any.
+        pwmPercent = rinsePumpPwmPercentage.data;
+        setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
     }
 
     return state;
@@ -307,34 +312,38 @@
     }
     else
     {
-        F32 pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );     // TODO should this conversion happen in setPWMCount function?
-        U32 pwmInCount   = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
+        F32 pwmPercent;
 
-        rinsePumpTargetSpeedRPM = (U32)( ( (F32)pwmInCount / RINSE_PUMP_PWM_IN_COUNT_MAX ) * (F32)RINSE_PUMP_MAX_RPM_ESTIMATE );
+        rinsePumpPwmPercentage.data = RINSE_PUMP_DEFAULT_PWM_PERCENT;
+        pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );
 
         // Turn on logical rinse pump with given PWM value
-        setRinsePumpPwmCount( D79_RINSE_PUMP, (U32)pwmInCount );
+        setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
     }
 
     return state;
 }
 
 /*********************************************************************//**
  * @brief
- * The setRinsePumpPwmCount function maps a logical rinse pump ID to the
- * underlying FPGA control and applies the requested PWM count.
- * @details \b Inputs: pumpId, pwmCount
+ * The setRinsePumpPwm function maps a logical rinse pump ID to the
+ * underlying FPGA control and applies the requested PWM.
+ * @details \b Inputs: pumpId, pwmPercent
  * @details \b Outputs: FPGA rinse pump control register
  * @param pumpId Logical rinse pump identifier
  * @param pwmCount PWM magnitude (0..RINSE_PUMP_PWM_IN_COUNT_MAX)
  * @return none
  *************************************************************************/
-static void setRinsePumpPwmCount( RINSE_PUMP_ID_T pumpId, U32 pwmCount )
+static void setRinsePumpPwm( RINSE_PUMP_ID_T pumpId, F32 pwmPercent )
 {
+    U08 pwmCount = (U08)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
+
+    rinsePumpTargetSpeedRPM = (U32)( ( (F32)pwmCount / RINSE_PUMP_PWM_IN_COUNT_MAX ) * (F32)RINSE_PUMP_MAX_RPM_ESTIMATE );
+
     switch ( pumpId )
     {
         case D79_RINSE_PUMP:
-            setFPGAD79RinsePumpPWMControl( (U08)pwmCount );
+            setFPGAD79RinsePumpPWMControl( pwmCount );
             break;
 
         default:
@@ -359,7 +368,7 @@
         RINSE_PUMP_PAYLOAD_T data;
 
         data.d79State   = getRinsePumpState();
-        data.d79PumpPWM = getF32OverrideValue( &rinsePumpPwmPercentage );
+        data.d79PumpPWM = ( getRinsePumpState() == RINSE_PUMP_STATE_OFF ? 0.0F : 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 ) );
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -r27dab35610123b728c64b9db11967c95a45a2b01 -ra70a78cad6ecddf3a5bc84e77b24ebc123b54161
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 27dab35610123b728c64b9db11967c95a45a2b01)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision a70a78cad6ecddf3a5bc84e77b24ebc123b54161)
@@ -152,7 +152,7 @@
     if ( previouspreGenPState != preGenPState )
     {
         setModePreGenPTransition( preGenPState );
-        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_CHANGE, preGenPState, previouspreGenPState )
+        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_CHANGE, previouspreGenPState, preGenPState )
     }
     //Publish pre Gen Permeate mode data
     publishPreGenPModeData();