Index: AlarmDefs.h
===================================================================
diff -u -rf297946513928f890351d6a927ffe9a9140754a7 -r2286870bb6faeaaed144b43e7f1af253ba0e3689
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision f297946513928f890351d6a927ffe9a9140754a7)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 2286870bb6faeaaed144b43e7f1af253ba0e3689)
@@ -63,7 +63,8 @@
     ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD,                  ///< DG accelerometer invalid calibration record
     ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,                  ///< HD accelerometer invalid calibration record
     ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD,                      ///< HD blood flow invalid calibration record
-    ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD,                  ///< HD dialysate flow invalid calibration record
+    ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD,                  ///< HD dialyzer flow invalid calibration record
+    ALARM_ID_HD_HEPARING_FORCE_SENSOR_INVALID_CAL_RECORD,           ///< HD heparin force sensor invalid calibration record
     ALARM_ID_HD_SOFTWARE_FAULT,                                     ///< HD Software fault. Software found itself in an unexpected state
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,                           ///< Blood pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running
     ALARM_ID_BLOOD_PUMP_OFF_CHECK,                                  ///< Blood pump failed motor off check.  Measured speed while commanded off
@@ -109,6 +110,7 @@
     ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE,                ///< HD blood flow meter status check self-test failure alarm
     ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE,            ///< HD dialysate flow meter status check self-test failure alarm
     ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE,                       ///< HD blood leak detector self-test failure alarm
+    ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE,                     ///< HD syringe pump self-test failure alarm
     ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE,                               ///< HD monitored voltage is out of range
     ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE,                               ///< DG monitored voltage is out of range
     ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR,               ///< HD syringe pump direction (from encoder) error
@@ -423,6 +425,7 @@
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_HEPARING_FORCE_SENSOR_INVALID_CAL_RECORD,      0,              ALARM_ID_NO_ALARM },
 
     // Machine fault high priority alarms
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_SOFTWARE_FAULT,                                0,              ALARM_ID_NO_ALARM },
@@ -470,6 +473,7 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE,           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE,       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE,                  0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE,                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE,                          0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE,                          0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR,          0,              ALARM_ID_NO_ALARM },