Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -rd8c3144d4fc5612981aa1bcee798a7c4756295bd --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision d8c3144d4fc5612981aa1bcee798a7c4756295bd) @@ -72,7 +72,10 @@ self.overall_elapsed_time = 0 self.state_elapsed_time = 0 self.heat_disinfect_target_time = 0 - self.heat_disinfect_count_down_time = 0 + self.disinfect_ro_77_time_s = 0 + self.disinfect_ro_82_time_s = 0 + self.disinfect_r_77_time_s = 0 + self.disinfect_r_82_time_s = 0 self.cancellation_mode = 0 self.r1_level = 0 self.r2_level = 0 @@ -105,7 +108,6 @@ self.r2_level = 0 self.heat_disinfect_ui_state = 0 - @publish(["heat_disinfect_target_time", "heat_disinfect_count_down_time"]) def _handler_heat_disinfect_to_ui_sync(self, message): """ @@ -116,11 +118,20 @@ """ disinfect_target_time = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - disinfect_count_down_time = struct.unpack('i', bytearray( + ro_77 = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + ro_82 = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + r_77 = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + r_82 = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.heat_disinfect_target_time = int(disinfect_target_time / 1000) - self.heat_disinfect_count_down_time = disinfect_count_down_time + self.disinfect_ro_77_time_s = ro_77 + self.disinfect_ro_82_time_s = ro_82 + self.disinfect_r_77_time_s = r_77 + self.disinfect_r_82_time_s = r_82 @publish(["heat_disinfect_state", "overall_elapsed_time", "state_elapsed_time", "cancellation_mode", "r1_level", "r2_level", "heat_disinfect_ui_state"]) Index: tests/dg_nvm_scripts.py =================================================================== diff -u -rae43c05f20c84d0d1ff8954d9e2b78df43ec5352 -rd8c3144d4fc5612981aa1bcee798a7c4756295bd --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision ae43c05f20c84d0d1ff8954d9e2b78df43ec5352) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision d8c3144d4fc5612981aa1bcee798a7c4756295bd) @@ -27,12 +27,12 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in your computer. - #dg.sw_configs.cmd_get_dg_sw_config_record() + dg.sw_configs.cmd_get_dg_sw_config_record() # Use cmd_set_dg_sw_config_record() set the changes back to firmware # This function requires an address for the excel report. Use the absolute address of your excel report like the # example below - dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2023-01-12-DG-SW-CONFIGS-Record.xlsx') + #dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2023-01-20-DG-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #dg.sw_configs.cmd_reset_dg_sw_config_record() Index: tests/dg_tests.py =================================================================== diff -u -rae43c05f20c84d0d1ff8954d9e2b78df43ec5352 -rd8c3144d4fc5612981aa1bcee798a7c4756295bd --- tests/dg_tests.py (.../dg_tests.py) (revision ae43c05f20c84d0d1ff8954d9e2b78df43ec5352) +++ tests/dg_tests.py (.../dg_tests.py) (revision d8c3144d4fc5612981aa1bcee798a7c4756295bd) @@ -116,11 +116,12 @@ 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(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, + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_RO_77, {}, Disinfect_RO_82, {}, ' + 'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, ' + .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.disinfect_ro_77_time_s, + dg.heat_disinfect.disinfect_ro_82_time_s, dg.heat_disinfect.disinfect_r_77_time_s, + dg.heat_disinfect.disinfect_r_82_time_s, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level, + hd.alarms.alarm_top, DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name)) return info @@ -730,7 +731,7 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() @@ -772,6 +773,12 @@ #hd.cmd_hd_software_reset_request() - #dg.cmd_dg_set_operation_mode(2) - hd.cmd_hd_set_operation_mode(2) + #dg.cmd_dg_software_reset_request() + #sleep(6) + #dg.temperatures.cmd_temperatures_value_override(0, 30) + #sleep(1) + #dg.valves.cmd_valve_override(8, 1) + #sleep(1) + #dg.pressures.cmd_pressure_override(0, 4) + #dg.conductivity_sensors.cmd_conductivity_sensor_override(0, 3000)