Index: dialin/common/msg_ids.py
===================================================================
diff -u -rab24503836ed04ff6e3f14b80fc9de92efb557b5 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision ab24503836ed04ff6e3f14b80fc9de92efb557b5)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -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
 #
@@ -212,6 +212,13 @@
     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_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5
+    MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6
 
     MSG_ID_CAN_ERROR_COUNT = 0x999
 
@@ -445,6 +452,9 @@
     MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE = 0xA05B
     MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE = 0xA05C
     MSG_ID_DG_NV_RECORD_CRC_OVERRIDE = 0xA05D
+    MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE = 0xA05E
+    MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE = 0xA05F
+    MSG_ID_DG_CONC_PUMP_PARK_COMMAND = 0xA060
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rbc2938a08b77bf1a26d1d6de59797aaa2a5124fc -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision bc2938a08b77bf1a26d1d6de59797aaa2a5124fc)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -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
 #
@@ -18,6 +18,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
@@ -31,6 +32,7 @@
 from .gen_idle import GenIdle
 from .hd_proxy import DGHDProxy
 from .heat_disinfect import HeatDisinfect
+from .heat_disinfect_active_cool import HeatDisinfectActiveCool
 from .heaters import Heaters
 from .load_cells import DGLoadCells
 from .pressures import DGPressures
@@ -164,6 +166,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.cpld = Cpld(self.can_interface, self.logger)
@@ -176,6 +179,7 @@
         self.gen_idle = GenIdle(self.can_interface, self.logger)
         self.hd_proxy = DGHDProxy(self.can_interface, self.logger)
         self.heat_disinfect = HeatDisinfect(self.can_interface, self.logger)
+        self.heat_disinfect_active_cool = HeatDisinfectActiveCool(self.can_interface, self.logger)
         self.heaters = Heaters(self.can_interface, self.logger)
         self.load_cells = DGLoadCells(self.can_interface, self.logger)
         self.pressures = DGPressures(self.can_interface, self.logger)
@@ -364,18 +368,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/dg/heat_disinfect.py
===================================================================
diff -u -r1ceb44f1f6d97ce295db7c3233043df9cca35746 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 1ceb44f1f6d97ce295db7c3233043df9cca35746)
+++ dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -39,15 +39,14 @@
     DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER = 11
     DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 12
     DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS = 13
-    DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER = 14
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 15
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 16
-    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 = 17
-    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18
-    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION = 19
-    DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 20
-    DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 21
-    DG_HEAT_DISINFECT_STATE_COMPLETE = 22
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 14
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 15
+    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 = 16
+    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 17
+    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION = 18
+    DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 19
+    DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 20
+    DG_HEAT_DISINFECT_STATE_COMPLETE = 21
 
 
 @unique
Index: dialin/hd/alarms.py
===================================================================
diff -u -rbe95b8a08acdcde08352f31a58082224c5a1653c -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/hd/alarms.py	(.../alarms.py)	(revision be95b8a08acdcde08352f31a58082224c5a1653c)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -7,8 +7,8 @@
 #
 # @file    alarms.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      12-Oct-2022
+# @author  (last)      Steve Jarpe
+# @date    (last)      30-Nov-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -453,16 +453,29 @@
         @return: none
         """
         self.logger.debug("Alarm activated!")
+        alarm_id = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
+        data_typ_1 = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
+        data_1 = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
+        data_typ_2 = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
+        data_2 = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+        priority = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
+        rank = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
+        clr_top_only = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
 
-        alarm_id = struct.unpack('<I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        alarm_priority = struct.unpack('<I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        alarm_rank = struct.unpack('<I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        alarm_cto = struct.unpack('<I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+        self.logger.debug("Alarm ID: %d %d %d" % (alarm_id[0], data_1[0], data_2[0]))
         self.alarm_states[alarm_id[0]] = True
         self.alarm_conditions[alarm_id[0]] = True
-        self.alarm_priorities[alarm_id[0]] = alarm_priority[0]
-        self.alarm_ranks[alarm_id[0]] = alarm_rank[0]
-        self.alarm_clear_top_only_flags[alarm_id[0]] = True if alarm_cto[0] == 1 else False
+        self.alarm_priorities[alarm_id[0]] = priority[0]
+        self.alarm_ranks[alarm_id[0]] = rank[0]
+        self.alarm_clear_top_only_flags[alarm_id[0]] = clr_top_only[0]
 
     @publish(["alarm_states", "alarm_conditions"])
     def _handler_alarm_clear(self, message):
Index: dialin/hd/battery.py
===================================================================
diff -u -r4f5af68bf0123a61ad464e7491f7951a865d9622 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/hd/battery.py	(.../battery.py)	(revision 4f5af68bf0123a61ad464e7491f7951a865d9622)
+++ dialin/hd/battery.py	(.../battery.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -24,6 +24,7 @@
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
+
 class HDBattery(AbstractSubSystem):
     """
     Hemodialysis Delivery (HD) Dialin API sub-class for battery subsystem.
@@ -263,4 +264,3 @@
         else:
             self.logger.debug("Timeout!!!!")
             return False
-
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r4f5af68bf0123a61ad464e7491f7951a865d9622 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 4f5af68bf0123a61ad464e7491f7951a865d9622)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -17,6 +17,7 @@
 
 from .accelerometer import HDAccelerometer
 from .air_bubbles import HDAirBubbles
+from .air_pump import HDAirPump
 from .air_trap import HDAirTrap
 from .alarms import HDAlarms
 from .battery import HDBattery
@@ -45,8 +46,9 @@
 from ..common.hd_defs import HDOpModes
 from .hd_events import HDEvents
 from .reservoirs import HDReservoirs
-from .sw_configs import HDSoftwareConfigs
 from .post_treatment import HDPostTreatment
+from .sw_configs import HDSoftwareConfigs
+from .battery import HDBattery
 from .usage_info_record import HDUsageNVRecord
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
@@ -133,6 +135,7 @@
         # Create command groups
         self.accel = HDAccelerometer(self.can_interface, self.logger)
         self.air_bubbles = HDAirBubbles(self.can_interface, self.logger)
+        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)
@@ -165,6 +168,7 @@
         self.hd_reservoirs = HDReservoirs(self.can_interface, self.logger)
         self.sw_configs = HDSoftwareConfigs(self.can_interface, self.logger)
         self.post_treatment = HDPostTreatment(self.can_interface, self.logger)
+        self.battery = HDBattery(self.can_interface, self.logger)
         self.usage_record = HDUsageNVRecord(self.can_interface, self.logger)
 
     def get_operation_mode(self):
Index: tests/dg_tests.py
===================================================================
diff -u -rab24503836ed04ff6e3f14b80fc9de92efb557b5 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- tests/dg_tests.py	(.../dg_tests.py)	(revision ab24503836ed04ff6e3f14b80fc9de92efb557b5)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -7,8 +7,8 @@
 #
 # @file    dg_tests.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      10-Nov-2022
+# @author  (last)      Steve Jarpe
+# @date    (last)      15-Dec-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Jan-2022
 #
@@ -21,6 +21,7 @@
 from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates
 from dialin.dg.heat_disinfect import HeatCancellationModes
 from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates
+from dialin.common.dg_defs import DGChemDisinfectFlushStates, DGChemDisinfectFlushUIStates
 from dialin.dg.chemical_disinfect import ChemCancellationModes
 from dialin.dg.drain_pump import DrainPumpStates
 from dialin.dg.thermistors import ThermistorsNames
@@ -46,7 +47,7 @@
 from dialin.hd.valves import HDValves
 from dialin.hd.voltages import HDMonitoredVoltages
 from dialin.hd.pretreatment import PreTreatmentRsrvrState
-from dialin.common.dg_defs import DGFlushStates
+from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates
 from time import sleep
 from datetime import datetime
 import sys
@@ -68,26 +69,44 @@
                     hd.alarms.alarm_top))
     return info
 
+def get_chemical_disinfect_flush_mode_info():
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, r1, {:5.1f}, r2, {:5.1f}, '
+             'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},'
+            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name,
+                    dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
+                    dg.chemical_disinfect_flush.r1, dg.chemical_disinfect_flush.r2,
+                    dg.chemical_disinfect_flush.target_rinse_count, dg.chemical_disinfect_flush.rinse_count,
+                    hd.alarms.alarm_top, dg.chemical_disinfect_flush.flush_UI_state))
+    return info
 
 def get_heat_disinfect_mode_info():
+    state = 0
+    state_elapsed_time = 0
+    overall_elapsed_time = 0
+    if dg.dg_operation_mode == 9:
+        state = DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name
+        overall_elapsed_time = dg.heat_disinfect.overall_elapsed_time
+        state_elapsed_time = dg.heat_disinfect.state_elapsed_time
+    elif dg.dg_operation_mode == 12:
+        state = DGHeatDisinfectActiveCoolStates(dg.heat_disinfect_active_cool.heat_disinfect_active_cool_state).name
+        overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time
+        state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time
+
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, '
-            .format(DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name,
-                    dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time,
+            .format(state, overall_elapsed_time, state_elapsed_time,
                     dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level,
                     dg.heat_disinfect.r2_level, hd.alarms.alarm_top,
-                    DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
+                    DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name))
     return info
 
 
 def get_flush_mode_info():
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, '
             .format(DGFlushStates(dg.flush.flush_state).name, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
                     dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top))
-
     return info
 
-
 def get_hd_run_info():
     info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, '
             'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, Prime_state, {}, Pre_Tx_rsrvr_state, {}, '
@@ -272,7 +291,7 @@
     info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, '
             'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, '
             'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, '
-            'Bicarb_tgt_speed, {:5.3f}, '
+            'Bicarb_tgt_speed, {:5.3f}, CP1_parked, {}, CP1_park_fault, {}, CP2_parked, {}, CP2_park_fault, {}, '
             .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed,
                     dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed,
@@ -286,7 +305,11 @@
                     dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status,
                     dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse,
                     dg.concentrate_pumps.concentrate_pump_cp1_target_speed,
-                    dg.concentrate_pumps.concentrate_pump_cp2_target_speed))
+                    dg.concentrate_pumps.concentrate_pump_cp2_target_speed,
+                    dg.concentrate_pumps.concentrate_pump_cp1_parked,
+                    dg.concentrate_pumps.concentrate_pump_cp1_park_fault,
+                    dg.concentrate_pumps.concentrate_pump_cp2_parked,
+                    dg.concentrate_pumps.concentrate_pump_cp2_park_fault))
     return info
 
 
@@ -463,6 +486,7 @@
     #dg.heaters.cmd_heaters_broadcast_interval_override(50)
     #sleep(1)
     dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
+    #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool()
 
     try:
         while True:
@@ -501,6 +525,8 @@
 
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False)
+        sleep(0.2)
+        dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool(start=False)
         f.close()
 
 
@@ -520,9 +546,10 @@
             ro = get_ro_info()
             temp = get_temperature_sensors_info()
             heaters = get_heaters_info()
-            fans = get_dg_fans_info()
+            #fans = get_dg_fans_info()
 
-            var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r'
+            #var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r'
+            var = disinfect + load_cell + conc + drain + ro + temp + heaters + valves + '\r'
 
             print(var)
             f.write(var)
@@ -543,7 +570,49 @@
         dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False)
         f.close()
 
+def run_chem_disinfect_flush_mode():
+    complete_counter = 1
+    f = open("/home/fw/projects/dialin/tests/chem_disinfect_flush_mode.log", "w")
+    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
+    #dg.cmd_dg_software_reset_request()
 
+    try:
+        while True:
+            flush = get_chemical_disinfect_flush_mode_info()
+            load_cell = get_load_cells_info()
+            drain = get_drain_states_info()
+            ro = get_ro_info()
+            temp = get_temperature_sensors_info()
+            conc = get_concentrate_pumps_info()
+            valves = get_dg_valves_states()
+
+            var = flush + load_cell + drain + ro + + temp + conc + valves + '\r'
+
+            print(var)
+            f.write(var)
+            sleep(1)
+
+            # If the mode came back to standby or standby solo
+            if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
+
+                # Write a few more complete states to make sure the complete state items are recorded
+                if complete_counter == 3:
+                    f.close()
+                    #events = dg.events.get_dg_events(2, 60)
+                    #for event in events:
+                    #    print(event)
+                    break
+
+                complete_counter += 1
+
+    except KeyboardInterrupt:
+        dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush(start=False)
+        f.close()
+        #events = dg.events.get_dg_events(2, 50)
+        #for event in events:
+        #    print(event)
+
+
 def cmd_set_disinfect_ui_screen():
     hd = HD()
     sleep(0.5)
@@ -571,7 +640,6 @@
             valves = get_dg_valves_states()
 
             var = flush + uv_reactors + load_cell + drain + ro + conc + valves + '\r'
-
             print(var)
             f.write(var)
             sleep(1)
@@ -639,6 +707,8 @@
 
     #run_chemical_disinfect()
 
+    run_chem_disinfect_flush_mode()
+
     #run_dg()
 
     # cmd_set_disinfect_ui_screen()
Index: tests/hd_nvm_scripts.py
===================================================================
diff -u -rab24503836ed04ff6e3f14b80fc9de92efb557b5 -r5fad1b021480de4d9708932bf3f68e27095c658f
--- tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision ab24503836ed04ff6e3f14b80fc9de92efb557b5)
+++ tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -71,7 +71,7 @@
     # in your computer.
     #hd.system_record.cmd_get_hd_system_record_report()
 
-    hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-09-26-HD-Record.xlsx')
+    hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-12-19-HD-Record.xlsx')
 
     # For resetting the system record to benign values, use the function below
     #hd.system_record.cmd_reset_hd_system_record()
@@ -119,9 +119,10 @@
         # Comment this function if not needed
         #run_calibration_commands()
 
-        #run_system_commands()
+        run_system_commands()
 
-        run_usage_info_commands()
+        #run_usage_info_commands()
 
         #run_service_commands()
 
+
Index: tools/Code_Report.csv
===================================================================
diff -u -r55c22314f05df5b21ea10b7bf8206113296f7a1b -r5fad1b021480de4d9708932bf3f68e27095c658f
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision 55c22314f05df5b21ea10b7bf8206113296f7a1b)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 5fad1b021480de4d9708932bf3f68e27095c658f)
@@ -31,6 +31,7 @@
 ./dg/chemical_disinfect.py, Function, get_chem_disinfect_target_post_rinse_count(self) -> int:
 ./dg/chemical_disinfect.py, Function, get_chem_disinfect_current_post_rinse_count(self) -> int:
 ./dg/chemical_disinfect.py, Function, get_chem_disinfect_chemical_disinfect_ui_state(self) -> int:
+./dg/chemical_disinfect_flush.py, Function, clear_flush_info(self) -> None:
 ./dg/chemical_disinfect.py, Function, clear_chem_disinfect_info(self) -> None:
 ./dg/concentrate_pumps.py, Function, cmd_concentrate_pump_state_change_request(self, pump_id: int, on: bool = False) -> int:
 ./dg/concentrate_pumps.py, Function, cmd_concentrate_pump_target_speed_override(self, pump_id: int, speed: float) -> int:
@@ -113,6 +114,7 @@
 ./dg/hd_proxy.py, Function, cmd_start_stop_dg_heat_disinfect(self, start: bool = True) -> int:
 ./dg/hd_proxy.py, Function, cmd_start_stop_dg_flush(self, start: bool = True) -> int:
 ./dg/hd_proxy.py, Function, cmd_start_stop_dg_chemical_disinfect(self, start: bool = True) -> int:
+./dg/hd_proxy.py, Function, cmd_start_stop_dg_chemical_disinfect_flush(self, start: bool = True) -> int:
 ./dg/hd_proxy.py, Function, cmd_resend_dg_alarms(self) -> int:
 ./dg/hd_proxy.py, Function, cmd_hd_communication_status_override(self, status: bool, reset: int = NO_RESET) -> int:
 ./dg/hd_proxy.py, Function, cmd_switch_reservoirs(self, reservoir_id: int = RESERVOIR1) -> int:
@@ -625,6 +627,14 @@
 dg/alarms.py, Variable, alarm_conditions
 dg/alarms.py, Variable, safety_shutdown_active
 dg/calibration_record.py, Variable, dg_calibration_record
+dg/chemical_disinfect_flush.py, Variable, flush_state
+dg/chemical_disinfect_flush.py, Variable, overall_elapsed_time
+dg/chemical_disinfect_flush.py, Variable, state_elapsed_time
+dg/chemical_disinfect_flush.py, Variable, r1
+dg/chemical_disinfect_flush.py, Variable, r2
+dg/chemical_disinfect_flush.py, Variable, target_rinse_count
+dg/chemical_disinfect_flush.py, Variable, rinse_count
+dg/chemical_disinfect_flush.py, Variable, flush_UI_state
 dg/chemical_disinfect.py, Variable, chemical_disinfect_state
 dg/chemical_disinfect.py, Variable, overall_elapsed_time
 dg/chemical_disinfect.py, Variable, state_elapsed_time
@@ -680,6 +690,7 @@
 dg/dialysate_generator.py, Variable, alarms
 dg/dialysate_generator.py, Variable, calibration_record
 dg/dialysate_generator.py, Variable, chemical_disinfect
+dg/dialysate_generator.py, Variable, chemical_disinfect_flush
 dg/dialysate_generator.py, Variable, concentrate_pumps
 dg/dialysate_generator.py, Variable, conductivity_sensors
 dg/dialysate_generator.py, Variable, cpld
@@ -1433,6 +1444,7 @@
 common/dg_defs.py, Enum, DGOpModes, DG_MODE_FLUS
 common/dg_defs.py, Enum, DGOpModes, DG_MODE_HEAT
 common/dg_defs.py, Enum, DGOpModes, DG_MODE_CHEM
+common/dg_defs.py, Enum, DGOpModes, DG_MODE_CHFL
 common/dg_defs.py, Enum, DGOpModes, DG_MODE_NLEG
 common/dg_defs.py, Enum, DGOpModes, NUM_OF_DG_MODES
 common/dg_defs.py, Enum, DGInitStates, DGInitStates
@@ -1572,27 +1584,36 @@
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DRAIN_R2
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PRIME_ACID_LINE
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI
+common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT
+common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH
+common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT
+common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2
-common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION
+common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, DG_CHEM_DISINFECT_STATE_COMPLETE
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, NUM_OF_DG_CHEM_DISINFECT_STATES
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DGChemDisinfectFlushStates
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_START
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R1
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R2
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, DGChemDisinfectFlushUIStates
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE
+common/dg_defs.py, Enum, DGChemDisinfectFlushUIStates, NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES
 common/dg_defs.py, Enum, DGChemDisinfectUIStates, DGChemDisinfectUIStates
 common/dg_defs.py, Enum, DGChemDisinfectUIStates, CHEM_DISINFECT_UI_STATE_NOT_RUNNING
 common/dg_defs.py, Enum, DGChemDisinfectUIStates, CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT
@@ -2134,6 +2155,11 @@
 common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_CPLD_STATUS
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_MANAGEMENT_DATA
 common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_BATTERY_STATUS_DATA
+common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA
+common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_CHEM_DISINFECT_FLUSH_TIME_DATA
+common/msg_ids.py, Enum, MsgIds, MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH
+common/msg_ids.py, Enum, MsgIds, MSG_ID_UI_CHEM_DISINFECT_FLUSH_CONFIRM
+common/msg_ids.py, Enum, MsgIds, MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE
 common/msg_ids.py, Enum, MsgIds, MSG_ID_CAN_ERROR_COUNT
 common/msg_ids.py, Enum, MsgIds, MSG_ID_TESTER_LOGIN_REQUEST
 common/msg_ids.py, Enum, MsgIds, MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE