Index: tools/Code_Report.csv
===================================================================
diff -u -r7ceecc09a8af490b72072537bdca88815d99c21c -r16911b15eaa9313cc01a37a34b1a3e54e2a90ef3
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision 7ceecc09a8af490b72072537bdca88815d99c21c)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 16911b15eaa9313cc01a37a34b1a3e54e2a90ef3)
@@ -616,9 +616,6 @@
 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
@@ -629,8 +626,6 @@
 dg/chemical_disinfect.py, Variable, cancellation_mode
 dg/chemical_disinfect.py, Variable, r1_level
 dg/chemical_disinfect.py, Variable, r2_level
-dg/chemical_disinfect.py, Variable, target_post_rinse_count
-dg/chemical_disinfect.py, Variable, current_post_rinse_count
 dg/chemical_disinfect.py, Variable, chemical_disinfect_ui_state
 dg/concentrate_pumps.py, Variable, concentrate_pump_cp1_current_set_speed
 dg/concentrate_pumps.py, Variable, concentrate_pump_cp1_measured_speed
@@ -1598,13 +1593,14 @@
 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_DRAIN_R1
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_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_SAMPLE_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