Index: AlarmDefs.h
===================================================================
diff -u -rdc504e6c3b59559a15a5b31c31afe9a17fa57082 -r9e3b0b79c6ab9608b40fbbf3ba953362a9b2e3fb
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision dc504e6c3b59559a15a5b31c31afe9a17fa57082)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 9e3b0b79c6ab9608b40fbbf3ba953362a9b2e3fb)
@@ -339,7 +339,7 @@
     { ALARM_PRIORITY_HIGH,    10,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_WATCHDOG_EXPIRED                                 },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_WATCHDOG_EXPIRED                                 },
     { ALARM_PRIORITY_HIGH,    10,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS                           },
-    { ALARM_PRIORITY_HIGH,   111,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO                      },
+    { ALARM_PRIORITY_HIGH,   111,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP                      },
     { ALARM_PRIORITY_HIGH,   111,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD                      },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_POST_TEST_FAILED                            },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE                   },
@@ -477,8 +477,8 @@
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE            },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE              },
     //   Priority            Rank  Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr ClrOnly TxLog  ID
-    { ALARM_PRIORITY_HIGH,   110,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT              },
-    { ALARM_PRIORITY_HIGH,   110,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE               },
+    { ALARM_PRIORITY_HIGH,   110,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT              },
+    { ALARM_PRIORITY_HIGH,   110,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE               },
     { ALARM_PRIORITY_HIGH,   110,  TRUE,  FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT                   },
     { ALARM_PRIORITY_HIGH,   110,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE       },
 };  //   Priority            Rank  Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr ClrOnly TxLog  ID
@@ -594,7 +594,7 @@
     { 110, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE },
     { 111, ALARM_ID_TD_DD_COMM_TIMEOUT },
     { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD },
-    { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO },
+    { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP },
     { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD },
     { 111, ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD },
     { 200, ALARM_ID_TD_VENOUS_PRESSURE_LOW },