Index: dialin/dg/chemical_disinfect.py
===================================================================
diff -u -rfe051f80c87d4d43ff6c8c1a598eacd62f61c5f8 -r16e000873965ed64ed3dc96050739bd958a4d912
--- dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision fe051f80c87d4d43ff6c8c1a598eacd62f61c5f8)
+++ dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -83,7 +83,6 @@
         self.current_post_rinse_count = 0
         self.chemical_disinfect_ui_state = 0
 
-
     @publish(["chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"])
     def _handler_chemical_disinfect_to_ui_sync(self, message):
         """
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -rbff28676dd855ea33707bbb26a624abc94aebdf0 -r16e000873965ed64ed3dc96050739bd958a4d912
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision bff28676dd855ea33707bbb26a624abc94aebdf0)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -62,7 +62,6 @@
         self.target_flow_lpm = 0.0
         self.feedback_duty_cycle_pct = 0.0
 
-
     def get_target_pressure(self):
         """
         Gets the target pressure
Index: dialin/dg/valves.py
===================================================================
diff -u -r79334f431b2177aa87bded7e28872e293cea8f05 -r16e000873965ed64ed3dc96050739bd958a4d912
--- dialin/dg/valves.py	(.../valves.py)	(revision 79334f431b2177aa87bded7e28872e293cea8f05)
+++ dialin/dg/valves.py	(.../valves.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -307,12 +307,14 @@
 
         # TODO Yes Behrouz, I will switch to the new method with automation scripts! No not immediately Behrouz.
         #  Dude this is an improvement hold on, it won't be ready immediately
-        start = 3
+        start = self.END_POS_VALVES_STATES
         end = start + 1
         for valve_id in self.valves_sensed_states:
+            #print(valve_id, start, end)
             self.valves_sensed_states[valve_id] = struct.unpack('B', bytearray(message['message'][start:end]))[0]
             start = end
             end += 1
+        # TODO Behrouz thanks for reminding me, I will work on it!
 
     def cmd_valve_sensed_state_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int:
         """
Index: tests/dg_nvm_scripts.py
===================================================================
diff -u -r19d246d9c099e1a15570767f82ca79502aff2776 -r16e000873965ed64ed3dc96050739bd958a4d912
--- tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 19d246d9c099e1a15570767f82ca79502aff2776)
+++ tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -83,11 +83,11 @@
 
     if dg.cmd_log_in_to_dg():
 
-        #run_sw_configs_commands()
+        run_sw_configs_commands()
 
         #run_calibration_commands()
 
-        run_system_commands()
+        #run_system_commands()
 
         #dg.usage_record.cmd_get_dg_usage_info_record()
         #dg.usage_record.cmd_update_dg_usage_info_record('/home/fw/projects/DG_NV_Records/2022-04-22-DG-Record.xlsx')
Index: tests/dg_tests.py
===================================================================
diff -u -r79334f431b2177aa87bded7e28872e293cea8f05 -r16e000873965ed64ed3dc96050739bd958a4d912
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 79334f431b2177aa87bded7e28872e293cea8f05)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -141,7 +141,7 @@
 
 def get_dg_valves_states():
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
-            'VRD1, {}, VRD2, {}, '
+            'VRD1, {}, VRD2, {}, All, {}, '
             .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT],
                     dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN],
@@ -154,7 +154,8 @@
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2],
+                    dg.valves.valves_sensed_states))
     return info
 
 
@@ -687,7 +688,7 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    #run_heat_disinfect()
+    run_heat_disinfect()
 
     #run_flush_mode()
 
@@ -724,16 +725,16 @@
     #    print(get_heaters_info())
     #    sleep(1)
 
-    #dg.ro_pump.cmd_set_ro_flow_rate(0.6)
-
     #dg.flow_sensors.cmd_measured_flow_sensor_value_lpm_override(1, 0.8, reset=1)
 
-    #while True:
+    #dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
+    #sleep(1)
+    #dg.heaters.cmd_start_stop_trimmer_heater(0)
 
-    #    print(get_ro_info())
+    #dg.valves.cmd_valve_sensed_state_override(4, 1, reset=1)
+
+    #while True:
+    #    print(get_dg_valves_states())
     #    sleep(1)
 
-    dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
-    sleep(1)
-    dg.heaters.cmd_start_stop_trimmer_heater(0)
 
Index: tests/peter/set_RTCs.py
===================================================================
diff -u -rbff28676dd855ea33707bbb26a624abc94aebdf0 -r16e000873965ed64ed3dc96050739bd958a4d912
--- tests/peter/set_RTCs.py	(.../set_RTCs.py)	(revision bff28676dd855ea33707bbb26a624abc94aebdf0)
+++ tests/peter/set_RTCs.py	(.../set_RTCs.py)	(revision 16e000873965ed64ed3dc96050739bd958a4d912)
@@ -29,7 +29,7 @@
     current_time_stamp = time()
     current_time = localtime(current_time_stamp)
     print(current_time)
-
+    """
     if hd.cmd_log_in_to_hd():
         hd.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec,
                                          current_time.tm_min,
@@ -48,5 +48,5 @@
                                          current_time.tm_mon,
                                          current_time.tm_year)
         print("Successfully set DG rtc")
-    """
+    #"""