Index: dialin/common/msg_ids.py =================================================================== diff -u -r5dc79b5e29a9cd78d5991525472859238f1df8ae -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 5dc79b5e29a9cd78d5991525472859238f1df8ae) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8) @@ -457,7 +457,9 @@ MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE = 0xA05F MSG_ID_DG_CONC_PUMP_PARK_COMMAND = 0xA060 MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE = 0xA061 - MSG_ID_DG_NELSON_DISINFECT_SUPPORT = 0xA062 + MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE = 0xA062 + MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE = 0xA063 + MSG_ID_DG_NELSON_DISINFECT_SUPPORT = 0xA064 MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/dg/calibration_record.py =================================================================== diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8 --- dialin/dg/calibration_record.py (.../calibration_record.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) +++ dialin/dg/calibration_record.py (.../calibration_record.py) (revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8) @@ -455,7 +455,7 @@ @return: conductivity sensors hardware group dictionary and the byte size of this hardware group """ - hardware_names = ['cpi', 'cpo', 'cd1', 'cd2', 'reserved_1', 'reserved_2'] + hardware_names = ['cpi', 'cpo', 'cd1', 'cd2', 'cd1_chem_dis', 'cd2_chem_dis'] group_byte_size = 0 group_name = 'conductivity_sensors' hardware_group = OrderedDict({group_name: OrderedDict()}) Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r4321c6a08162f15464cdae9419688eaad53aa890 -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 4321c6a08162f15464cdae9419688eaad53aa890) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8) @@ -49,12 +49,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 you computer. - #dg.calibration_record.cmd_get_dg_calibration_record_report() + dg.calibration_record.cmd_get_dg_calibration_record_report() # Use cmd_set_dg_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 - dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-12-09-DG-Record-DVT-002.xlsx') + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2023-02-01-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() Index: tests/dg_tests.py =================================================================== diff -u -r4321c6a08162f15464cdae9419688eaad53aa890 -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8 --- tests/dg_tests.py (.../dg_tests.py) (revision 4321c6a08162f15464cdae9419688eaad53aa890) +++ tests/dg_tests.py (.../dg_tests.py) (revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8) @@ -64,7 +64,7 @@ state = DGChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name overall_elapsed_time = dg.chemical_disinfect.overall_elapsed_time state_elapsed_time = dg.chemical_disinfect.state_elapsed_time - nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name + nelson_support = NelsonSupportModes(dg.chemical_disinfect.chem_nelson_support).name elif dg.dg_operation_mode == 11: state = DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name overall_elapsed_time = dg.chemical_disinfect_flush.overall_elapsed_time @@ -123,8 +123,8 @@ nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name 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, {}, ' - 'Nelson_support, {}, ' + 'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {},' + ' Nelson_support, {}, ' .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, @@ -569,8 +569,8 @@ 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_flush() + dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() + #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() try: while True: @@ -665,14 +665,15 @@ def run_nelson_support_modes(): - dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_HEAT_DISINFECT.value) + dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_CHEM_DISINFECT.value) f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w") try: while True: - disinfect = get_heat_disinfect_mode_info() + #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() @@ -692,6 +693,7 @@ 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()