Index: DDDefs.h
===================================================================
diff -u -r0c744919c9530b711276b8336534ec2d0395a17c -r9ff021d7e87ab963ee82046b5329811011ed0732
--- DDDefs.h	(.../DDDefs.h)	(revision 0c744919c9530b711276b8336534ec2d0395a17c)
+++ DDDefs.h	(.../DDDefs.h)	(revision 9ff021d7e87ab963ee82046b5329811011ed0732)
@@ -82,12 +82,23 @@
 enum DD_Fault_States
 {
     DD_FAULT_STATE_START = 0,                   ///< DD fault start state
-    DD_FAULT_STATE_RUN_NV_POSTS,                ///< DD fault run RTC and NV data management posts
+    DD_FAULT_DEENERGIZED_STATE,                 ///< DD fault deenergized state
+    DD_FAULT_ENERGIZED_STATE,                   ///< DD fault energized state
     DD_FAULT_STATE_COMPLETE,                    ///< DD fault complete
     NUM_OF_DD_FAULT_STATES                      ///< Number of fault mode states
 };
 typedef enum DD_Fault_States DD_FAULT_STATE_T;  ///< Type for DD fault states enumeration
 
+/// Enumeration of fault NV data management states.
+enum DD_Fault_NVDataMgmt_States
+{
+    DD_FAULT_NVDATA_STATE_START = 0,            ///< DD fault NVData management start state
+    DD_FAULT_NVDATA_STATE_RUN_NV_POSTS,         ///< DD fault run RTC and NV data management posts
+    DD_FAULT_NVDATA_STATE_COMPLETE,             ///< DD fault NVData management complete
+    NUM_OF_DD_FAULT_NVDATA_STATES               ///< Number of fault NVdata management states
+};
+typedef enum DD_Fault_NVDataMgmt_States DD_FAULT_NVDATA_STATE_T;  ///< Type for DD fault NVdata Management states enumeration
+
 /**@}*/
 
 /**
Index: MsgDefs.h
===================================================================
diff -u -r87d2e5e349cd03a7914d8ca2d8b0ccfce89698d7 -r9ff021d7e87ab963ee82046b5329811011ed0732
--- MsgDefs.h	(.../MsgDefs.h)	(revision 87d2e5e349cd03a7914d8ca2d8b0ccfce89698d7)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 9ff021d7e87ab963ee82046b5329811011ed0732)
@@ -211,7 +211,7 @@
     MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027,                    ///< DD TD CAN Communication status override request
     MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028,                             ///< DD operation mode status override request
     MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029,                         ///< DD set new operation mode override request
-    MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA02A,                   ///< DD start gen dialysate mode override request
+    MSG_ID_DD_AVAILABLE_TO_USE_1 = 0xA02A,                                          ///< DD start gen dialysate mode override request
     MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B,                 ///< DD dialysate pumps start/stop override request
     MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C,                     ///< DD generate dialysate mode data publish interval override request
     MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D,               ///< DD Concentrate pumps start/stop override request
@@ -232,9 +232,9 @@
     MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C,                          ///< DD heaters PWM period override request
     MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D,                 ///< DD Pre generate dialysate mode data publish interval override request
     MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E,                ///< DD Post generate dialysate mode data publish interval override request
-    MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F,               ///< DD start pre-gen dialysate mode override request
-    MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040,                ///< DD stop pre-gen dialysate mode override request
-    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041,                    ///< DD stop gen dialysate mode override request
+    MSG_ID_DD_AVAILABLE_TO_USE_3 = 0xA03F,                                          ///< DD start pre-gen dialysate mode override request
+    MSG_ID_DD_AVAILABLE_TO_USE_2 = 0xA040,                                          ///< DD stop pre-gen dialysate mode override request
+    MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041,                                          ///< DD stop gen dialysate mode override request
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00,                   ///< DD piston pump data publish interval override request
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01,                     ///< DD piston pump start/stop override request