Index: dialin/common/msg_ids.py =================================================================== diff -u -r1ceb44f1f6d97ce295db7c3233043df9cca35746 -raa38884ffae56e67897e1ea53108c4a950bdd998 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 1ceb44f1f6d97ce295db7c3233043df9cca35746) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision aa38884ffae56e67897e1ea53108c4a950bdd998) @@ -356,7 +356,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006 MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007 MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008 - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009 + MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP = 0xA009 MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C Index: dialin/dg/temperatures.py =================================================================== diff -u -r889854fedb9ee0711460f6addd9b79e0a5ece718 -raa38884ffae56e67897e1ea53108c4a950bdd998 --- dialin/dg/temperatures.py (.../temperatures.py) (revision 889854fedb9ee0711460f6addd9b79e0a5ece718) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision aa38884ffae56e67897e1ea53108c4a950bdd998) @@ -10,7 +10,7 @@ # @author (last) Micahel Garthwaite # @date (last) 30-Aug-2022 # @author (original) Dara Navaei -# @date (original) 01-Dec-2021 +# @date (original) 01-Dec-2021` # ############################################################################ import struct @@ -45,8 +45,9 @@ LOAD_CELL_A2_B2 = 15 INTERNAL_THDO_RTD = 16 INTERNAL_TDI_RTD = 17 - INTERNAL_COND_TEMP_SENSOR = 18 - BARO_TEMP_SENSOR = 19 + INTERNAL_THD_RTD = 18 + INTERNAL_COND_TEMP_SENSOR = 19 + BARO_TEMP_SENSOR = 20 class TemperatureSensors(AbstractSubSystem): @@ -87,7 +88,7 @@ def get_temperatures_values(self, sensor): """ - Gets a temperature sensor's value + Gets a temperature sensor's value based on the sensor @param sensor: (int) temperature sensor index @return: The temperature of a temperature sensor Index: tests/dg_tests.py =================================================================== diff -u -r1ceb44f1f6d97ce295db7c3233043df9cca35746 -raa38884ffae56e67897e1ea53108c4a950bdd998 --- tests/dg_tests.py (.../dg_tests.py) (revision 1ceb44f1f6d97ce295db7c3233043df9cca35746) +++ tests/dg_tests.py (.../dg_tests.py) (revision aa38884ffae56e67897e1ea53108c4a950bdd998) @@ -29,7 +29,7 @@ from dialin.hd.temperatures import HDTemperaturesNames from dialin.dg.concentrate_pumps import DGConcentratePumpsStates from dialin.dg.uv_reactors import ReactorsNames -from dialin.common.hd_defs import HDOpModes, PreTreatmentWetSelfTestStates, PostTreatmentStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentWetSelfTestStates, PostTreatmentStates from dialin.hd.post_treatment import HDPostTreatmentDrainStates from dialin.common.dg_defs import DGEventList from dialin.common.hd_defs import HDEventList @@ -515,9 +515,8 @@ dg_fans = get_dg_fans_info() hd_fans = get_hd_fans_info() conc = get_concentrate_pumps_info() - uv = get_uv_reactors_info() - var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + uv + '\r' + var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' print(var) f.write(var) @@ -690,7 +689,7 @@ hd.cmd_log_in_to_hd() sleep(1) - run_heat_disinfect() + #run_heat_disinfect() #run_flush_mode() @@ -700,7 +699,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() @@ -740,3 +739,5 @@ # print(get_ro_info()) # sleep(1) + #dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52) + Index: tests/hd_nvm_scripts.py =================================================================== diff -u -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8 -raa38884ffae56e67897e1ea53108c4a950bdd998 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision aa38884ffae56e67897e1ea53108c4a950bdd998) @@ -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/2022-08-13-HD-Record.xlsx') + hd.calibration_record.cmd_set_hd_calibration_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-08-13-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 you 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-09-26-HD-Record.xlsx') + hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-09-26-HD-Record.xlsx') # For resetting the system record to benign values, use the function below #hd.system_record.cmd_reset_hd_system_record()