Index: AlarmDefs.h
===================================================================
diff -u -rf4db59b1e311807fdd3d1fb723ce6cc7e483d44d -ra057d3752532ccb763b461fa8abc997d68848771
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision f4db59b1e311807fdd3d1fb723ce6cc7e483d44d)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a057d3752532ccb763b461fa8abc997d68848771)
@@ -233,8 +233,8 @@
     ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 195,                           ///< DG RO pump pressure out of range
     ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT = 196,                   ///< DG temperature sensor error bit fault
     ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT = 197,                       ///< DG temperature sensors FPGA fault
-    ALARM_ID__AVAILABLE_10 = 198,                                           ///< Alarm ID available for use
-    ALARM_ID__AVAILABLE_14 = 199,                                           ///< Alarm ID available for use
+    ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON = 198,              ///< RO flow too low while primary heater is on
+    ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON = 199,       ///< Dialysate flow too low while trimmer heater is on
     ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 200,                 ///< DG thermistors/sensors temperature out of range
     ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE = 201,                     ///< HD pre-treatment mode wet self-test lc vs FMD failure
     ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE = 202,          ///< HD pre-treatment mode dry pressure normal self-test failure
@@ -325,7 +325,7 @@
     ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287,                       ///< HD processor clock speed checks against FPGA clock failure
     ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 288,          ///< HD load cells primary/back up drift out of range
     ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION = 289,         ///< DG dialysate or concentrate caps not closed
-    ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON = 290,                         ///< DG flow too low while heater is on
+    ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON = 290,     // TODO remove when DEN-13460 merged                    ///< DG flow too low while heater is on
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -650,9 +650,9 @@
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE,                    0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT,            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT,                0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_10,                                    0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON,       0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoBRcr NoDRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
-    { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_14,                                    0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON,0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE,          0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE,              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    910,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE,   0,              ALARM_ID_NO_ALARM },
@@ -951,6 +951,8 @@
     {   3, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT },
     {   3, ALARM_ID_HD_RTC_BATTERY_LOW },
     {   3, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION },
+    {   3, ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON },
+    {   3, ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON },
     {   4, ALARM_ID_END_OF_TREATMENT_HIGH },
     {   5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK },
     {   6, ALARM_ID_HD_BLOOD_LEAK_DETECTED },
@@ -989,8 +991,6 @@
     { 799, ALARM_ID_HD_COMM_TIMEOUT },
     { 799, ALARM_ID__AVAILABLE_13 },
     { 799, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE },
-    { 799, ALARM_ID__AVAILABLE_10 },
-    { 799, ALARM_ID__AVAILABLE_14 },
     { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED },
     { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT },
     { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED },