Index: DGDefs.h
===================================================================
diff -u -re329f530417906e4740a48cb8d80b1bd43d57b50 -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba
--- DGDefs.h	(.../DGDefs.h)	(revision e329f530417906e4740a48cb8d80b1bd43d57b50)
+++ DGDefs.h	(.../DGDefs.h)	(revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba)
@@ -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
@@ -158,7 +159,8 @@
     DG_FILL_MODE_STATE_BICARB_PUMP_CHECK,               ///< Run bicarb concentrate pump and check conductivity range
     DG_FILL_MODE_STATE_ACID_PUMP_CHECK,                 ///< Run acid concentrate pump and check conductivity range
     DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION,            ///< Dialysate production state
-    DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state
+    DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state
+    DG_FILL_MODE_STATE_PAUSED,                          ///< Dialysate generation pause state
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states
 };
 typedef enum DG_Fill_Mode_States DG_FILL_MODE_STATE_T;  ///< Type for DG fill mode states enumeration
@@ -174,7 +176,8 @@
 enum DG_Drain_States
 {
     DG_DRAIN_STATE_START = 0,                   ///< Start drain mode state
-    DG_DRAIN_STATE_DRAIN,                       ///< Drain drain mode state
+    DG_DRAIN_STATE_DRAIN,                       ///< Drain drain mode state
+    DG_DRAIN_STATE_TARE,                        ///< Tare drain mode state
     NUM_OF_DG_DRAIN_STATES                      ///< Number of drain mode states
 };
 typedef enum DG_Drain_States DG_DRAIN_STATE_T;  ///< Type for DG drain mode states enumeration
@@ -264,6 +267,7 @@
     DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2,                     ///< Chemical disinfect, flush drain R2 state
     DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1,                     ///< Chemical disinfect, flush drain R1 state
     DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT,   ///< Chemical disinfect, fill with water and disinfectant state
+    DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI,         ///< Chemical disinfect, remove the acid bottle from UI state
     DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Chemical disinfect, disinfect R1 to R2 state
     DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT,          ///< Chemical disinfect, fill R2 with disinfectant state
     DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Chemical disinfect, disinfect R2 to R1 state
@@ -279,8 +283,21 @@
     DG_CHEM_DISINFECT_STATE_COMPLETE,                           ///< Chemical disinfect, complete state
     NUM_OF_DG_CHEM_DISINFECT_STATES                             ///< Number of chemical disinfect mode states
 };
-typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;          ///< Type for DG chemical disinfect states enumeration
+typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;          ///< Type for DG chemical disinfect states enumeration
 
+/// Enumeration of chemical disinfect mode UI states
+enum DG_Chem_UI_State
+{
+    CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 0,         ///< Chemical disinfect, flush before disinfect state
+    CHEM_DISINFECT_UI_STATE_REMOVE_ACID,                        ///< Chemical disinfect, remove acid state
+    CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE,                   ///< Chemical disinfect, disinfect device state
+    CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT,              ///< Chemical disinfect, flush after disinfect state
+    CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT,                   ///< Chemical disinfect, cancel disinfect state
+    CHEM_DISINFECT_UI_STATE_COMPLETE,                           ///< Chemical disinfect, complete state
+    NUM_OF_CHEM_DISINFECT_UI_STATES                             ///< Number of chemical disinfect UI states
+};
+typedef enum DG_Chem_UI_State DG_CHEM_DISINFECT_UI_STATE_T;     ///< Type for DG chemical disinfect UI states enumeration
+
 /**@}*/
 
 /**