Index: firmware/App/Controllers/FlowSensors.c
===================================================================
diff -u -r0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e -r4e11c80367b5ae522aa34fb137079e516c98831b
--- firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e)
+++ firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 4e11c80367b5ae522aa34fb137079e516c98831b)
@@ -137,7 +137,7 @@
 
 #ifndef _VECTORCAST_
             default:
-                // TODO software fault
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED, i );
                 break;
 #endif
         }
@@ -164,7 +164,9 @@
  *************************************************************************/
 F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId )
 {
-    return getF32OverrideValue( &flowSensorStatus[ sensorId ].measuredFlowLPM );
+    F32 flow = getF32OverrideValue( &flowSensorStatus[ sensorId ].measuredFlowLPM );
+
+    return flow;
 }
 
 /*********************************************************************//**
@@ -182,6 +184,7 @@
     if ( ++dataPublicationCounter >= getU32OverrideValue( &flowSensorsDataPublishInterval ) )
     {
         FLOW_SENSORS_DATA_T data;
+
         data.ROFlowRateLPM        = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
         data.dialysateFlowRateLPM = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR );
         data.ROFlowRateWithCPsLPM = getF32OverrideValue( &flowSensorStatus[ RO_FLOW_SENSOR ].measuredROFlowWithCPsLPM );