Index: firmware/App/Controllers/DialysateFlow.c
===================================================================
diff -u -re8c019d3d43b517cabfdfe75fa5d03749d036018 -r224b86c0847207c168d38fa1713a1e9116642267
--- firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision e8c019d3d43b517cabfdfe75fa5d03749d036018)
+++ firmware/App/Controllers/DialysateFlow.c	(.../DialysateFlow.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
@@ -52,8 +52,8 @@
 
 static OVERRIDE_F32_T measuredDialysateFlowRateLPM = { 0.0, 0.0, 0.0, 0 };                         ///< Measured Dialysate flow rate (in L/min).
 
-static S32 measuredFlowReadingsSum = 0;                                                            ///< Raw flow reading sums for averaging.
-static U32 flowFilterCounter = 0;                                                                  ///< Flow filtering counter.
+static S32 measuredFlowReadingsSum;                                                                ///< Raw flow reading sums for averaging.
+static U32 flowFilterCounter;                                                                      ///< Flow filtering counter.
 static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord;                                          ///< Flow sensors calibration record.
 
 // ********** private function prototypes **********
@@ -138,7 +138,7 @@
         measuredDialysateFlowRateLPM.data = pow(flow, 4) * flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].fourthOrderCoeff +
                                             pow(flow, 3) * flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].thirdOrderCoeff  +
                                             pow(flow, 2) * flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].secondOrderCoeff +
-                                                flow     * flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].gain +
+                                                flow     * flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].gain             +
                                                            flowSensorsCalRecord.flowSensors[ CAL_DATA_DIALYSATE_FLOW_SENSOR ].offset;
 
         // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
@@ -148,11 +148,11 @@
         }
 
         measuredFlowReadingsSum = 0;
-        flowFilterCounter = 0;
+        flowFilterCounter       = 0;
     }
 
-    currentFlow = getMeasuredDialysateFlowRate();
-    isFlowOutOfUpperRange = currentFlow > MAX_DIALYSATE_FLOWRATE_LPM;
+    currentFlow           = getMeasuredDialysateFlowRate();
+    isFlowOutOfUpperRange = ( currentFlow > MAX_DIALYSATE_FLOWRATE_LPM ? TRUE : FALSE );
     checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, isFlowOutOfUpperRange, currentFlow, MAX_DIALYSATE_FLOWRATE_LPM );
 
     // Publish dialysate flow meter data on the CAN bus according to the specified interval