Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -r0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e)
@@ -164,7 +164,8 @@
     initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS,
                                                                           HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
 
-    initPersistentAlarm( ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -333,17 +334,32 @@
         // Check if the heater is on and if it is, check the flow sensor's status
         if ( TRUE == heatersStatus[ heater ].isHeaterOn )
         {
-            // TODO add the function that gets the flow of the new flow sensor for DG. For now it is assumed that trimmer heater flow sensor
-            // is not 0 so the heater can run if needed
-            F32 measFlow   = ( DG_PRIMARY_HEATER == heater ? getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) /*getMeasuredROFlowRateLPM()*/ : 50.0 );
-            F32 minFlow    = ( DG_PRIMARY_HEATER == heater ? MIN_RO_FLOWRATE_LPM : MIN_RO_FLOWRATE_LPM );
-            BOOL isFlowLow = ( measFlow < minFlow ? TRUE : FALSE );
+            ALARM_ID_T alarm;
+            F32 measFlow;
+            F32 minFlow;
+            BOOL isFlowLow;
 
-            checkPersistentAlarm( ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON, isFlowLow, measFlow, minFlow );
+            if ( DG_PRIMARY_HEATER == heater )
+            {
+                alarm    = ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON;
+                measFlow = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
+                minFlow  = MIN_RO_FLOWRATE_LPM;
+            }
+            else
+            {
+                alarm    = ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON;
+                measFlow = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR );
+                minFlow  = MIN_DIALYSATE_FLOWRATE_LPM;
+            }
+
+            isFlowLow = ( measFlow < minFlow ? TRUE : FALSE );
+
+            checkPersistentAlarm( alarm, isFlowLow, measFlow, minFlow );
         }
         else
         {
-            checkPersistentAlarm( ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON, FALSE, 0.0, 0.0 );
+            checkPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, FALSE, 0.0, 0.0 );
+            checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, FALSE, 0.0, 0.0 );
         }
     }
 
@@ -626,7 +642,7 @@
         F32 targetFlowLPM              = heatersStatus[ DG_TRIMMER_HEATER ].targetFlow;
         F32 dutyCycle                  = calculateTrimmerHeaterDutyCycle( targetTemperature, outletRedundantTemperature, targetFlowLPM, TRUE );
         trimmerHeaterControlCounter    = 0;
-        setHeaterDutyCycle( DG_TRIMMER_HEATER, dutyCycle );
+        setHeaterDutyCycle( DG_TRIMMER_HEATER, ( heatersStatus[ DG_TRIMMER_HEATER ].dutycycle + dutyCycle ) );
     }
 
     return state;