Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -rcfc93e92b406ebd56c1718f941ffa09bfda8af85
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision cfc93e92b406ebd56c1718f941ffa09bfda8af85)
@@ -62,7 +62,8 @@
 #define MINIMUM_TARGET_TEMPERATURE                                 10.0F                                                           ///< Minimum allowed target temperature for the heaters.
 #define MAXIMUM_TARGET_TEMPERATURE                                 90.0F                                                           ///< Maximum allowed target temperature for the heaters.
 
-#define HEATERS_ON_NO_FLOW_TIMEOUT_MS                              ( 10 * MS_PER_SECOND )                                          ///< Heaters on with no flow time out in milliseconds.
+#define PRIMARY_HEATER_ON_NO_FLOW_TIMEOUT_MS                       ( 10 * MS_PER_SECOND )                                          ///< Primary heater on with no flow time out in milliseconds.
+#define TRIMMER_HEATER_ON_NO_FLOW_TIMEOUT_MS                       ( 12 * MS_PER_SECOND )                                          ///< Trimmer heater on with no flow time out in milliseconds.
 #define HEATERS_MAX_OPERATING_VOLTAGE_V                            24.0F                                                           ///< Heaters max operating voltage in volts.
 #define HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS                    ( 2 * MS_PER_SECOND )                                           ///< Heaters voltage out of range time out in milliseconds.
 #define HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL                       0.2F                                                            ///< Heaters max voltage out of range tolerance.
@@ -164,8 +165,8 @@
     initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     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_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, 0, PRIMARY_HEATER_ON_NO_FLOW_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, 0, TRIMMER_HEATER_ON_NO_FLOW_TIMEOUT_MS );
 
     // Initialize the FPGA persistent alarm
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT,