Index: AlarmDefs.h
===================================================================
diff -u -r1b7f9d7c38749486ae7ff5a3b02fe7943caa8099 -r7290aebde28f67fcee4f2c1d6d0c77b5abc6dc5e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 1b7f9d7c38749486ae7ff5a3b02fe7943caa8099)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 7290aebde28f67fcee4f2c1d6d0c77b5abc6dc5e)
@@ -223,6 +223,7 @@
     ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE,          ///< DG trimmer heater internal temperature out of range
     ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT,                    ///< DG heaters on with no flow time out
     ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT,                     ///< DG drain circulation line timeout
+    ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED,                        ///< HD battery pack detected an error
     ALARM_ID_BLOOD_SITTING_WARNING,                                 ///< Blood sitting too long warning (>4 min)
     ALARM_ID_END_OF_TREATMENT_ALARM,                                ///< HD end of treatment alarm (user not acting to end treatment)
     ALARM_ID_PRIME_COMPLETED_MEDIUM,                                ///< HD prime completed medium priority alarm
@@ -232,6 +233,7 @@
     ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE,                      ///< HD blood prime volume check failure
     ALARM_ID_HD_SYRINGE_DETECTED,                                   ///< HD syringe detected alarm
     ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED,                       ///< HD syringe pump syringe removed alarm
+    ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW,                        ///< HD battery pack SOC is too low.
     ALARM_ID_EMPTY_SALINE_BAG,                                      ///< HD Saline bag is empty
     ALARM_ID_DIALYSATE_TEMPERATURE_HIGH,                            ///< HD dialysate temperature too high alarm
     ALARM_ID_DIALYSATE_TEMPERATURE_LOW,                             ///< HD dialysate temperature too low alarm
@@ -571,6 +573,7 @@
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE,     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT,               0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT,                0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED,                   0,              ALARM_ID_NO_ALARM },
 
     // Medium priority alarms
     { ALARM_PRIORITY_MEDIUM, 800,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_SITTING_WARNING,                            ALM_ESC_1_MIN,  ALARM_NO_RINSEBACK },
@@ -582,6 +585,7 @@
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED,                              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED,                  0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW,                   0,              ALARM_ID_NO_ALARM },
 
     // Low priority alarms
     { ALARM_PRIORITY_LOW,    900,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG,                                 0,              ALARM_ID_NO_ALARM },
@@ -602,7 +606,7 @@
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_INSTALL_NEW_CARTRIDGE,                            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_NO_CARTRIDGE_LOADED,                              0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE,  FALSE, FALSE, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE,                        0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT,                       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT,                        0,              ALARM_ID_NO_ALARM },
Index: HDDefs.h
===================================================================
diff -u -rccb76a48d2e15f7355e8455486f096c069c8f5b2 -r7290aebde28f67fcee4f2c1d6d0c77b5abc6dc5e
--- HDDefs.h	(.../HDDefs.h)	(revision ccb76a48d2e15f7355e8455486f096c069c8f5b2)
+++ HDDefs.h	(.../HDDefs.h)	(revision 7290aebde28f67fcee4f2c1d6d0c77b5abc6dc5e)
@@ -54,6 +54,7 @@
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
     POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
+    POST_STATE_BATTERY,                                 ///< Run battery SOC test state
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_RTC,                                     ///< Run RTC test state
     POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test state