Index: AlarmDefs.h
===================================================================
diff -u -rd91ed4c2a0ca5175a64dde417ae80b831c310364 -rde7a096a7bd997c722d31d17e2faf0490fde9e8b
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision d91ed4c2a0ca5175a64dde417ae80b831c310364)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision de7a096a7bd997c722d31d17e2faf0490fde9e8b)
@@ -264,6 +264,7 @@
     ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE                  = 232,  ///< DD invalid bicarbonate concentrate calibration record
     ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR                        = 233,  ///< DD invalid accelerometer sensor calibration record
     ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR                   = 234,  ///< DD invalid blood leak sensor calibration record
+    ALARM_ID_DD_NVM_INVALID_CAL_CONDUCTIVITY_SENSOR                 = 235,  ///< DD invalid conductivity sensor calibration record
     NUM_OF_ALARM_IDS                                                        ///< Number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                         ///< Type for alarm list enumeration
@@ -675,6 +676,7 @@
     { ALARM_PRIORITY_HIGH,     2,  ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE               },
     { ALARM_PRIORITY_HIGH,     2,  ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR                     },
     { ALARM_PRIORITY_HIGH,     2,  ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR                },
+    { ALARM_PRIORITY_HIGH,     2,  ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_CONDUCTIVITY_SENSOR              },
 };  //   Priority            Rank  Source      Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr AutoRes ClrOnly TxLog  ID
 
 /// Table of alarms and their rank.
@@ -723,6 +725,7 @@
     {   2, ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE },
     {   2, ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR },
     {   2, ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR },
+    {   2, ALARM_ID_DD_NVM_INVALID_CAL_CONDUCTIVITY_SENSOR },
     {  10, ALARM_ID_TD_SOFTWARE_FAULT },
     {  10, ALARM_ID_TD_UI_COMM_TIMEOUT },
     {  10, ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS },
@@ -1181,6 +1184,7 @@
  { 232 , ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE                , "DD    | Service Required: Dialysate Device      | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                              | DD POST: Bicarb Concentrate CRC          | DD invalid bicarbonate concentrate calibration record                                                                                     | If the calculated CRC of the DD bicarbonate concentrate calibration record image does not match the expected CRC.                                                                                                                                                                | "},
  { 233 , ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR                      , "DD    | Service Required: Dialysate Device      | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                              | DD POST: Accel Sensor CRC                | DD invalid accelerometer sensor calibration record                                                                                        | If the calculated CRC of the DD accelerometer sensor calibration record image does not match the expected CRC.                                                                                                                                                                   | "},
  { 234 , ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR                 , "DD    | Service Required: Dialysate Device      | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                              | DD POST: Blood Leak sensor CRC           | DD invalid blood leak sensor calibration record                                                                                           | If the calculated CRC of the DD blood leak sensor calibration record image does not match the expected CRC.                                                                                                                                                                      | "},
+ { 235 , ALARM_ID_DD_NVM_INVALID_CAL_CONDUCTIVITY_SENSOR               , "DD    | Service Required: Dialysate Device      | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                                                              | DD POST: Conductivity sensor CRC         | DD invalid conductivity sensor calibration record                                                                                         | If the calculated CRC of the DD conductivity sensor calibration record image does not match the expected CRC.                                                                                                                                                                    | "},
 };
 #endif  // manual alarms