Index: dialin/common/dg_defs.py =================================================================== diff -u -rb512a9393474d83243c08d7adf550540b2877f10 -r293a9792727fc7d9e87ee14055c19316a8f0c907 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision b512a9393474d83243c08d7adf550540b2877f10) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 293a9792727fc7d9e87ee14055c19316a8f0c907) @@ -175,16 +175,12 @@ DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER = 11 # Heat disinfect, fill R2 with hot water state DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 12 # Heat disinfect, disinfect R2 to R1 state DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS = 13 # Heat disinfect, cool down heaters state - DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER = 14 # Heat disinfect, cool down RO filter state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 15 # Heat disinfect, mix drain R1 state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 16 # Heat disinfect, mix drain R2 state - DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 = 17 # Heat disinfect, rinse R1 to R2 state - DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18 # Heat disinfect, rinse R2 to R1 and drain R1 state - DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION = 19 # Heat disinfect, rinse circulation state - DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 20 # Heat disinfect, cancel mode basic path state - DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 21 # Heat disinfect, cancel mode water path state - DG_HEAT_DISINFECT_STATE_COMPLETE = 22 # Heat disinfect, complete state - NUM_OF_DG_HEAT_DISINFECT_STATES = 23 # Number of heat disinfect mode states + DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 14 # Heat disinfect, mix drain R1 state + DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 15 # Heat disinfect, mix drain R2 state + DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 16 # Heat disinfect, cancel mode basic path state + DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 17 # Heat disinfect, cancel mode water path state + DG_HEAT_DISINFECT_STATE_COMPLETE = 18 # Heat disinfect, complete state + NUM_OF_DG_HEAT_DISINFECT_STATES = 19 # Number of heat disinfect mode states @unique Index: tests/dg_nvm_scripts.py =================================================================== diff -u -rb512a9393474d83243c08d7adf550540b2877f10 -r293a9792727fc7d9e87ee14055c19316a8f0c907 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision b512a9393474d83243c08d7adf550540b2877f10) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 293a9792727fc7d9e87ee14055c19316a8f0c907) @@ -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/2022-11-29-DG-SW-CONFIGS-Record.xlsx') + #dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-11-29-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() @@ -116,9 +116,9 @@ #run_calibration_commands() - run_system_commands() + #run_system_commands() - #run_usage_info_commands() + run_usage_info_commands() #run_service_commands() Index: tests/dg_tests.py =================================================================== diff -u -rb512a9393474d83243c08d7adf550540b2877f10 -r293a9792727fc7d9e87ee14055c19316a8f0c907 --- tests/dg_tests.py (.../dg_tests.py) (revision b512a9393474d83243c08d7adf550540b2877f10) +++ tests/dg_tests.py (.../dg_tests.py) (revision 293a9792727fc7d9e87ee14055c19316a8f0c907) @@ -79,8 +79,8 @@ 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 - state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time 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, {}, ' @@ -283,7 +283,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, @@ -296,7 +296,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 @@ -473,8 +477,8 @@ f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") #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() + dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() + #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() try: while True: @@ -647,7 +651,7 @@ hd.cmd_log_in_to_hd() sleep(1) - run_heat_disinfect() + #run_heat_disinfect() #run_flush_mode() @@ -657,7 +661,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r165a814489f7d0e91655b8861d4a4acac3d57f51 -r293a9792727fc7d9e87ee14055c19316a8f0c907 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 165a814489f7d0e91655b8861d4a4acac3d57f51) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 293a9792727fc7d9e87ee14055c19316a8f0c907) @@ -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() +