Index: firmware/App/Drivers/FluidPump.c
===================================================================
diff -u -r0e4bb73e37fea7102ede86938c597b95bae577b7 -ra3ed83ddd9e39aceb6216da6e640c0e369de2902
--- firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision 0e4bb73e37fea7102ede86938c597b95bae577b7)
+++ firmware/App/Drivers/FluidPump.c	(.../FluidPump.c)	(revision a3ed83ddd9e39aceb6216da6e640c0e369de2902)
@@ -32,8 +32,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 US_IN_SECONDS                                 ( 1 / US_PER_SECOND )     ///< One micro second in relation to 1 second
-#define TEN_US_IN_SECONDS                             ( 10 * US_IN_SECONDS )    ///< 10 micro seconds in relation to 1 second.
+#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.
 
 /// Payload record structure for fluid pump set PWM request
@@ -121,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 * US_IN_SECONDS ));
+                fluidPumpMeasRPM[ pump ].data =  ( FLUID_PUMP_P40_COUNTS_2_RPM_NUMERATOR / ( p40RPMCnts * TEN_US_IN_SECONDS ));
             }
             else
             {