Index: firmware/App/Controllers/FlowSensors.c
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r851ee579efc2add1f16a5012bdaac93658e760ea
--- firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Controllers/FlowSensors.c	(.../FlowSensors.c)	(revision 851ee579efc2add1f16a5012bdaac93658e760ea)
@@ -81,9 +81,10 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
     BOOL calStatus            = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
-                                                    NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD );
-    result                    = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
+                                                    NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
 
+    result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
+
     return result;
 }
 
@@ -106,7 +107,7 @@
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
-                            NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD );
+                            NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
     }
 
     for ( i = 0; i < NUM_OF_FLOW_SENSORS; i++ )
@@ -146,7 +147,7 @@
     }
 
     // TODO dialysate flow alarm. Is it needed?
-    //currentFlow           = getMeasuredDialysateFlowRate();
+    //currentFlow           = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR );
     //isFlowOutOfUpperRange = ( currentFlow > MAX_DIALYSATE_FLOWRATE_LPM ? TRUE : FALSE );
     //checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, isFlowOutOfUpperRange, currentFlow, MAX_DIALYSATE_FLOWRATE_LPM );
 
@@ -205,7 +206,6 @@
         dataPublicationCounter    = 0;
 
         broadcastData( MSG_ID_DG_FLOW_SENSORS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLOW_SENSORS_DATA_T ) );
-
     }
 }