Index: dialin/common/msg_ids.py
===================================================================
diff -u -r7e4d7c18db6fe196c164f6975fbf8062d9c41a3f -r70647af995e01166cc59996470e2554e2f54b378
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 7e4d7c18db6fe196c164f6975fbf8062d9c41a3f)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 70647af995e01166cc59996470e2554e2f54b378)
@@ -8,7 +8,7 @@
 # @file    msg_ids.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      14-Nov-2022
+# @date    (last)      21-Dec-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
@@ -204,6 +204,19 @@
     MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5
     MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6
     MSG_ID_DG_RTC_EPOCH = 0xB7
+    MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8
+    MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9
+    MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA
+    MSG_ID_UI_CONFIRMATION_RESULT = 0xBB
+    MSG_ID_REQUEST_CPLD_STATUS = 0xBC
+    MSG_ID_DG_CPLD_STATUS = 0xBD
+    MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE
+    MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF
+    MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA = 0xC0
+    MSG_ID_DG_CHEM_DISINFECT_FLUSH_TIME_DATA = 0xC1
+    MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH = 0xC2
+    MSG_ID_UI_CHEM_DISINFECT_FLUSH_CONFIRM = 0xC3
+    MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4
 
     MSG_ID_CAN_ERROR_COUNT = 0x999
 
@@ -306,7 +319,7 @@
     MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0x8061
     MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062
     MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063
-    MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064
+    MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE = 0x8064
     MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE = 0x8065
     MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0x8066
     MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0x8067
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rf41b8d86fed7fa08b1ecf42cb39f4406ce149cf5 -r70647af995e01166cc59996470e2554e2f54b378
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision f41b8d86fed7fa08b1ecf42cb39f4406ce149cf5)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 70647af995e01166cc59996470e2554e2f54b378)
@@ -7,8 +7,8 @@
 #
 # @file    dialysate_generator.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      13-Oct-2022
+# @author  (last)      Sean Nash
+# @date    (last)      21-Dec-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -20,6 +20,7 @@
 from .alarms import DGAlarms
 from .calibration_record import DGCalibrationNVRecord
 from .chemical_disinfect import ChemicalDisinfect
+from .chemical_disinfect_flush import ChemicalDisinfectFlushMode
 from .concentrate_pumps import ConcentratePumps
 from .conductivity_sensors import ConductivitySensors
 from .constants import RESET, NO_RESET
@@ -164,6 +165,7 @@
         self.alarms = DGAlarms(self.can_interface, self.logger)
         self.calibration_record = DGCalibrationNVRecord(self.can_interface, self.logger)
         self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger)
+        self.chemical_disinfect_flush = ChemicalDisinfectFlushMode(self.can_interface, self.logger)
         self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
         self.dialysate_fill = DialysateFill(self.can_interface, self.logger)
@@ -363,18 +365,7 @@
             Must be logged into DG.
             Transition from current to requested op mode must be legal.
 
-        @param new_mode:  ID of operation mode to transition to
-            DG_MODE_FAUL = 0
-            DG_MODE_SERV = 1
-            DG_MODE_INIT = 2
-            DG_MODE_STAN = 3
-            DG_MODE_SOLO = 4
-            DG_MODE_GENE = 5
-            DG_MODE_FILL = 6
-            DG_MODE_DRAI = 7
-            DG_MODE_FLUS = 8
-            DG_MODE_HEAT = 9
-            DG_MODE_CHEM = 10
+        @param new_mode:  ID of operation mode to transition to (see DGOpModes enum for options)
 
         @return: 1 if successful, zero otherwise
 
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -rb2c16c3c893565c8efbd3dd7d76fe11dfc27b389 -r70647af995e01166cc59996470e2554e2f54b378
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision b2c16c3c893565c8efbd3dd7d76fe11dfc27b389)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 70647af995e01166cc59996470e2554e2f54b378)
@@ -7,8 +7,8 @@
 #
 # @file    hemodialysis_device.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      08-Sep-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      08-Dec-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -20,6 +20,7 @@
 from .air_pump import HDAirPump
 from .air_trap import HDAirTrap
 from .alarms import HDAlarms
+from .battery import HDBattery
 from .blood_flow import HDBloodFlow
 from .blood_leak import HDBloodLeak
 from .buttons import HDButtons
@@ -136,6 +137,7 @@
         self.air_pump = HDAirPump(self.can_interface, self.logger)
         self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
+        self.battery = HDBattery(self.can_interface, self.logger)
         self.blood_leak = HDBloodLeak(self.can_interface, self.logger)
         self.bloodflow = HDBloodFlow(self.can_interface, self.logger)
         self.buttons = HDButtons(self.can_interface, self.logger)