Index: dialin/common/dg_defs.py =================================================================== diff -u -rcb130637058af1a50ece54c74965099f3ac4a9b1 -rdce48f241ae5db68b5ce9832b0575f64a99c1710 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision cb130637058af1a50ece54c74965099f3ac4a9b1) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision dce48f241ae5db68b5ce9832b0575f64a99c1710) @@ -162,27 +162,28 @@ @unique class DGHeatDisinfectStates(DialinEnum): - DG_HEAT_DISINFECT_STATE_START = 0 # Heat disinfect, start mode state - DG_HEAT_DISINFECT_STATE_DRAIN_R1 = 1 # Heat disinfect, drain R1 state - DG_HEAT_DISINFECT_STATE_DRAIN_R2 = 2 # Heat disinfect, drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN = 3 # Heat disinfect, flush drain state - DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION = 4 # Heat disinfect, flush circulation state - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 # Heat disinfect, flush R1 and R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 # Heat disinfect, flush R2 and drain R1 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 # Heat disinfect, flush drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 # Heat disinfect, flush drain R1 state - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER = 9 # Heat disinfect, fill with water state - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 10 # Heat disinfect, disinfect R1 to R2 state - 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_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 - DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER = 19 - NUM_OF_DG_HEAT_DISINFECT_STATES = 20 # Number of heat disinfect mode states + DG_HEAT_DISINFECT_STATE_START = 0 # Heat disinfect, start mode state + DG_HEAT_DISINFECT_STATE_DRAIN_R1 = 1 # Heat disinfect, drain R1 state + DG_HEAT_DISINFECT_STATE_DRAIN_R2 = 2 # Heat disinfect, drain R2 state + DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN = 3 # Heat disinfect, flush drain state + DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION = 4 # Heat disinfect, flush circulation state + DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 # Heat disinfect, flush R1 and R2 state + DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 # Heat disinfect, flush R2 and drain R1 state + DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 # Heat disinfect, flush drain R2 state + DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 # Heat disinfect, flush drain R1 state + DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER = 9 # Heat disinfect, fill with water state + DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 10 # Heat disinfect, disinfect R1 to R2 state + DG_HEAT_DISINFECT_STATE_PREPARE_FOR_HOT_WATER_TRANSITION = 11 # Heat disinfect, prepare for hot water transition + 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_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 + DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER = 19 # Heat disinfect, Nelson support state + NUM_OF_DG_HEAT_DISINFECT_STATES = 20 # Number of heat disinfect mode states @unique Index: tests/dg_tests.py =================================================================== diff -u -redb4707f0ccf786624a1a6c8cfaa359a35cea7e3 -rdce48f241ae5db68b5ce9832b0575f64a99c1710 --- tests/dg_tests.py (.../dg_tests.py) (revision edb4707f0ccf786624a1a6c8cfaa359a35cea7e3) +++ tests/dg_tests.py (.../dg_tests.py) (revision dce48f241ae5db68b5ce9832b0575f64a99c1710) @@ -529,7 +529,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() + #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() try: while True: @@ -733,7 +733,7 @@ #run_flush_mode() - #run_chemical_disinfect() + run_chemical_disinfect() #hd.alarms.cmd_alarm_state_override(319, 1) #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense() @@ -755,9 +755,9 @@ # print(get_dg_valves_states()) # sleep(1) - while True: - print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) - sleep(1) + #while True: + # print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) + # sleep(1) #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1) @@ -771,7 +771,8 @@ #while True: # print(dg.switches.dg_switches_status) # sleep(1) - - - - + #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() + #while True: + # print(hd.alarms.get_alarm_state(286), hd.alarms.get_alarm_state(289), dg.alarms.get_alarm_state(286), + # dg.alarms.get_alarm_state(289)) + # sleep(0.5) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r3263cf899c0b76f1521d600402df327546af6bd9 -rdce48f241ae5db68b5ce9832b0575f64a99c1710 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 3263cf899c0b76f1521d600402df327546af6bd9) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision dce48f241ae5db68b5ce9832b0575f64a99c1710) @@ -50,12 +50,12 @@ # It creates a folder called HD_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. - #hd.calibration_record.cmd_get_hd_calibration_record_report() + hd.calibration_record.cmd_get_hd_calibration_record_report() # Use cmd_set_hd_calibration_excel_to_fw() 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 - hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2023-06-23-HD-Record.xlsx') + #hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2023-08-26-HD-Record.xlsx') # For resetting the calibration record to benign values, use the function below #hd.calibration_record.cmd_reset_hd_calibration_record() @@ -69,9 +69,9 @@ # 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. - hd.system_record.cmd_get_hd_system_record_report() + #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-12-19-HD-Record.xlsx') + hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2023-08-25-HD-Record.xlsx') # For resetting the system record to benign values, use the function below #hd.system_record.cmd_reset_hd_system_record()