Index: firmware/App/Drivers/FluidPump.c
===================================================================
diff -u -ra3ed83ddd9e39aceb6216da6e640c0e369de2902 -r19e682bf3a5ad3593935db055af7b80bb9354ab4
--- firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision a3ed83ddd9e39aceb6216da6e640c0e369de2902)
+++ firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision 19e682bf3a5ad3593935db055af7b80bb9354ab4)
@@ -33,7 +33,7 @@
 #define FLUID_PUMP_P12_COUNTS_2_RPM_NUMERATOR         1500000.0F                ///< Numerator in counts to RPM conversion.
 #define FLUID_PUMP_COUNTS_FOR_STOPPED_PUMP            0xFFFF                    ///< FPGA will report FFFF counts when pump is stopped.
 #define TEN_US_IN_SECONDS                             0.00001F                  ///< 10 micro seconds in relation to 1 second.
-#define FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR         30                        ///< Fixed known value for RPM conversion with P40.
+#define FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR         30.0F                     ///< Fixed known value for RPM conversion with P40.
 
 /// Payload record structure for fluid pump set PWM request
 typedef struct
@@ -93,7 +93,7 @@
 void readFluidPumps( void )
 {
     U32 p12Tach;
-    U16 p40RPMCnts;
+    U32 p40RPMCnts;
     U32 pump;
 
     for ( pump = 0; pump < NUM_OF_PUMPS; pump++ )
@@ -120,7 +120,7 @@
             p40RPMCnts = (U32)getFPGAP40PumpRPMCount();
             if ( ( p40RPMCnts != 0 ) && ( p40RPMCnts < FLUID_PUMP_COUNTS_FOR_STOPPED_PUMP ) )
             {
-                fluidPumpMeasRPM[ pump ].data =  ( FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR / ( p40RPMCnts * TEN_US_IN_SECONDS ));
+                fluidPumpMeasRPM[ pump ].data = ( FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR / ( (F32)p40RPMCnts * TEN_US_IN_SECONDS ));
             }
             else
             {
@@ -344,7 +344,7 @@
  *************************************************************************/
 F32 convertDutyCycleCntToPct( FP_FLUID_PUMP_T pumpID, U32 dutyCycleCnt )
 {
-    F32 pwmCnt = 0.0;
+    F32 pwmCnt = 0.0F;
 
     if ( pumpID < NUM_OF_PUMPS )
     {