Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -r7fe939e59e034a80456d9f865c6fda428c2ae861 -ra994d47d279b23603de37a19bf947b8212527190 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 7fe939e59e034a80456d9f865c6fda428c2ae861) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -8,7 +8,7 @@ # @file heat_disinfect.py # # @author (last) Dara Navaei -# @date (last) 03-Feb-2023 +# @date (last) 14-Feb-2023 # @author (original) Dara Navaei # @date (original) 27-Feb-2021 # @@ -62,11 +62,10 @@ NELSON_NONE = 0 NELSON_INOCULATE = 1 NELSON_HEAT_DISINFECT = 2 - NELSON_POS_CONTROL_CHEM_DISINFECT = 3 - NELSON_POS_CONTROL_HEAT_DISINFECT = 4 - NELSON_CHEM_DISINFECT = 5 - NELSON_DRAIN_SAMPLE = 6 - NUM_OF_NELSON_SUPPORT = 7 + NELSON_POS_CONTROL_HEAT_DISINFECT = 3 + NELSON_CHEM_DISINFECT = 4 + NELSON_DRAIN_SAMPLE = 5 + NUM_OF_NELSON_SUPPORT = 6 class HeatDisinfect(AbstractSubSystem): Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r32001abdfb62770761771b563eb6ff517152fc76 -ra994d47d279b23603de37a19bf947b8212527190 --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 32001abdfb62770761771b563eb6ff517152fc76) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -684,3 +684,4 @@ payload=payload) self.can_interface.send(message, 0) + Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r095ca3226b2c95e8a2135f99bea8d57a03274536 -ra994d47d279b23603de37a19bf947b8212527190 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 095ca3226b2c95e8a2135f99bea8d57a03274536) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -7,8 +7,8 @@ # # @file hd_simulator.py # -# @author (last) Darren Cox -# @date (last) 08-Nov-2022 +# @author (last) Behrouz NematiPour +# @date (last) 10-Feb-2023 # @author (original) Peter Lucia # @date (original) 06-Aug-2020 # Index: tests/dg_tests.py =================================================================== diff -u -r7fe939e59e034a80456d9f865c6fda428c2ae861 -ra994d47d279b23603de37a19bf947b8212527190 --- tests/dg_tests.py (.../dg_tests.py) (revision 7fe939e59e034a80456d9f865c6fda428c2ae861) +++ tests/dg_tests.py (.../dg_tests.py) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -488,10 +488,10 @@ heaters = get_heaters_info() dg_fans = get_dg_fans_info() conc_pumps = get_concentrate_pumps_info() - blood_leak = get_blood_leak_info() + blood_leak = "0" #get_blood_leak_info() hd_pumps = get_hd_pumps_info() fill_info = get_dg_fill_info() - idle_bad_fill = get_dg_idle_bad_fill_info() + idle_bad_fill = '0' #get_dg_idle_bad_fill_info() uv = get_uv_reactors_info() hd_fans = get_hd_fans_info() hd_pressures = get_hd_occlusion_pressures_info() @@ -562,7 +562,7 @@ def run_chemical_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() + #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() try: @@ -656,40 +656,6 @@ # print(event) -def run_nelson_support_modes(): - - dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_POS_CONTROL_HEAT_DISINFECT.value) - - f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w") - - try: - while True: - - disinfect = get_heat_disinfect_mode_info() - #disinfect = get_chemical_disinfect_mode_info() - drain = get_drain_states_info() - load_cell = get_load_cells_info() - valves = get_dg_valves_states() - ro = get_ro_info() - temp = get_temperature_sensors_info() - heaters = get_heaters_info() - uv = get_uv_reactors_info() - dg_fans = get_dg_fans_info() - hd_fans = get_hd_fans_info() - conc = get_concentrate_pumps_info() - - var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' - - print(var) - f.write(var) - sleep(1) - - except KeyboardInterrupt: - dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False) - f.close() - - if __name__ == "__main__": dg = DG(log_level='DEBUG') dg.cmd_log_in_to_dg() @@ -698,13 +664,13 @@ hd.cmd_log_in_to_hd() sleep(1) - #run_heat_disinfect() + run_heat_disinfect() #run_flush_mode() #run_chemical_disinfect() - #run_chem_disinfect_flush_mode() + #hd.alarms.cmd_alarm_state_override(319, 1) #run_dg() @@ -714,8 +680,6 @@ #collect_hd_treatment() - run_nelson_support_modes() - #while True: # print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info()) # print(get_dg_valves_states()) @@ -732,12 +696,4 @@ #hd.cmd_hd_software_reset_request() - #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) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r32001abdfb62770761771b563eb6ff517152fc76 -ra994d47d279b23603de37a19bf947b8212527190 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 32001abdfb62770761771b563eb6ff517152fc76) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -33,7 +33,7 @@ # Use cmd_update_hd_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 - hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-11-22-HD-SW-CONFIGS-Record.xlsx') + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2023-02-07-HD-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #hd.sw_configs.cmd_reset_hd_sw_config_record() @@ -114,12 +114,12 @@ if hd.cmd_log_in_to_hd(): # Comment this function if not needed - #run_sw_configs_commands() + run_sw_configs_commands() # Comment this function if not needed #run_calibration_commands() - run_system_commands() + #run_system_commands() #run_usage_info_commands() Index: tools/Code_Report.csv =================================================================== diff -u -r24ec6967b88d52009d7f0fd9a47076014095e628 -ra994d47d279b23603de37a19bf947b8212527190 --- tools/Code_Report.csv (.../Code_Report.csv) (revision 24ec6967b88d52009d7f0fd9a47076014095e628) +++ tools/Code_Report.csv (.../Code_Report.csv) (revision a994d47d279b23603de37a19bf947b8212527190) @@ -2551,7 +2551,6 @@ dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_NONE dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_INOCULATE dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_HEAT_DISINFECT -dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_POS_CONTROL_CHEM_DISINFECT dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_POS_CONTROL_HEAT_DISINFECT dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_CHEM_DISINFECT dg/heat_disinfect.py, Enum, NelsonSupportModes, NELSON_DRAIN_SAMPLE