Index: AlarmDefs.h
===================================================================
diff -u -r6e5cdda566f9d9346a37dd885dfea2b569c54589 -r3e9c8d16e41646b5483a64247bdcc366d5f4ed8e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6e5cdda566f9d9346a37dd885dfea2b569c54589)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 3e9c8d16e41646b5483a64247bdcc366d5f4ed8e)
@@ -262,17 +262,12 @@
     ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 224,          ///< DG load cells weight out of range before tare
     ALARM_ID_HD_BATTERY_COMM_FAULT = 225,                           ///< HD battery communication fault
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 226,                           ///< HD syringe pump stall alarm
+    ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 227,                   ///< HD firmware image integrity POST test failed
+    ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 228,                   ///< DG firmware image integrity POST test failed
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
 
-// ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE
-// ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT
-// ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE
-// ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE
-// ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT
-// ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT
-
 /// Enumeration of alarm priorities.
 enum Alarm_Priorities
 {
@@ -606,6 +601,8 @@
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_BATTERY_COMM_FAULT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_STALL
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED
     // Priority              Rank   Escalate In     Escalate To                              Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };
 
Index: DGDefs.h
===================================================================
diff -u -re329f530417906e4740a48cb8d80b1bd43d57b50 -r3e9c8d16e41646b5483a64247bdcc366d5f4ed8e
--- DGDefs.h	(.../DGDefs.h)	(revision e329f530417906e4740a48cb8d80b1bd43d57b50)
+++ DGDefs.h	(.../DGDefs.h)	(revision 3e9c8d16e41646b5483a64247bdcc366d5f4ed8e)
@@ -56,6 +56,7 @@
 {
     DG_POST_STATE_START = 0,                    ///< Start initialize & POST mode state
     DG_POST_STATE_FW_COMPATIBILITY,             ///< Run firmware compatibility test state
+    DG_POST_STATE_FW_INTEGRITY,                 ///< Run firmware image integrity test state
     DG_POST_STATE_FPGA,                         ///< FPGA POST test state
     DG_POST_STATE_RTC,                          ///< RTC POST test state
     DG_POST_STATE_NVDATAMGMT,                   ///< Non-volatile data management POST state
Index: HDDefs.h
===================================================================
diff -u -ra419b56fd034a3ddd0740f7e87e7f5732a54dcb6 -r3e9c8d16e41646b5483a64247bdcc366d5f4ed8e
--- HDDefs.h	(.../HDDefs.h)	(revision a419b56fd034a3ddd0740f7e87e7f5732a54dcb6)
+++ HDDefs.h	(.../HDDefs.h)	(revision 3e9c8d16e41646b5483a64247bdcc366d5f4ed8e)
@@ -53,6 +53,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_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_RTC,                                     ///< Run RTC test state
Index: MsgDefs.h
===================================================================
diff -u -rc96e354133bda28fef7c673c8d876915c0f59c36 -r3e9c8d16e41646b5483a64247bdcc366d5f4ed8e
--- MsgDefs.h	(.../MsgDefs.h)	(revision c96e354133bda28fef7c673c8d876915c0f59c36)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3e9c8d16e41646b5483a64247bdcc366d5f4ed8e)
@@ -158,6 +158,7 @@
     MSG_ID_DG_VOLTAGES_DATA = 0x86,                                     ///< DG voltages data publish
     MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87,                               ///< DG chemical disinfect data publish
     MSG_ID_HD_BUBBLES_DATA = 0x93,                                      ///< HD broadcast of air bubble detectors data
+    MSG_ID_HD_TREATMENT_LOG_PERIOD_DATA = 0x94,                         ///< HD broadcast of treatment log period data
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing