Index: firmware/App/Drivers/FlowSensor.c
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r863f8f88c73ee5dd285242f6e131a14862b4f5c4
--- firmware/App/Drivers/FlowSensor.c	(.../FlowSensor.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Drivers/FlowSensor.c	(.../FlowSensor.c)	(revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4)
@@ -32,7 +32,7 @@
 
 // ********** private data **********
 
-static OVERRIDE_F32_T currentFlowReadings[ NUM_OF_FLOW_SENSORS ];                                       ///< Current flow sensor pressure readings (overrideable).
+static OVERRIDE_S32_T currentFlowReadings[ NUM_OF_FLOW_SENSORS ];                                       ///< Current flow sensor pressure readings (overrideable).
 static OVERRIDE_F32_T currentFlowTempReadings[ NUM_OF_FLOW_SENSORS ];                                   ///< Current flow sensor temperature readings (overrideable).
 
 // ********** private function prototypes **********
@@ -51,9 +51,9 @@
     // Initialize override structures for each pressure sensor
     for ( sensor = FLOW_SENSOR_FIRST; sensor < NUM_OF_FLOW_SENSORS; sensor++ )
     {
-        currentFlowReadings[ sensor ].data = 0.0F;
-        currentFlowReadings[ sensor ].ovData = 0.0F;
-        currentFlowReadings[ sensor ].ovInitData = 0.0F;
+        currentFlowReadings[ sensor ].data = 0;
+        currentFlowReadings[ sensor ].ovData = 0;
+        currentFlowReadings[ sensor ].ovInitData = 0;
         currentFlowReadings[ sensor ].override = OVERRIDE_RESET;
 
         currentFlowTempReadings[ sensor ].data = 0.0F;
@@ -75,9 +75,9 @@
  *************************************************************************/
 void readFlowSensors( void )
 {
-    // Update and convert raw flow rates to mL/min
-    currentFlowReadings[ P16_FLOW ].data = (F32)( (S16)getFPGAFlowP16() );
-    currentFlowReadings[ P7_FLOW ].data   = (F32)( (S16)getFPGAFlowP7() );
+    // Update raw flow rates to mL/min
+    currentFlowReadings[ P16_FLOW ].data = ( (S16)getFPGAFlowP16() );
+    currentFlowReadings[ P7_FLOW ].data   = ( (S16)getFPGAFlowP7() );
 
     // Update and convert raw flow sensor temperatures to deg C
     currentFlowTempReadings[ P16_FLOW ].data = (F32)( (S16)getFPGAFlowP16Temp() ) / FLOW_TEMPERATURE_DIVIDER;
@@ -94,9 +94,9 @@
  * @param sensor ID of flow sensor to get flow rate for.
  * @return The current flow rate (in mL/min) of the given flow sensor.
  *************************************************************************/
-F32 getFlowRate( FLOW_SENSORS_T sensor )
+S32 getFlowRate( FLOW_SENSORS_T sensor )
 {
-    F32 result = 0.0F;
+    S32 result = 0;
 
     if ( sensor < NUM_OF_FLOW_SENSORS )
     {
@@ -162,7 +162,7 @@
  *************************************************************************/
 BOOL testFlowSensorReadingsOverride( MESSAGE_T *message )
 {
-    BOOL result = f32ArrayOverride( message, &currentFlowReadings[0], NUM_OF_FLOW_SENSORS - 1 );
+    BOOL result = s32ArrayOverride( message, &currentFlowReadings[0], NUM_OF_FLOW_SENSORS - 1 );
 
     return result;
 }