Index: dialin/common/msg_ids.py =================================================================== diff -u -rc1ec3baacb779f5176e3a7a619fe49f2dc4c19cd -r2f84b99b836aa1f5646a789e4b21db51c764b514 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision c1ec3baacb779f5176e3a7a619fe49f2dc4c19cd) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 2f84b99b836aa1f5646a789e4b21db51c764b514) @@ -220,6 +220,7 @@ MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5 MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6 MSG_ID_HD_AIR_PUMP_DATA = 0xC7 + MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG = 0xC8 MSG_ID_CAN_ERROR_COUNT = 0x999 Index: tests/dg_tests.py =================================================================== diff -u -r0448a5c20523f3bd085494b5f797c833a3a0e46d -r2f84b99b836aa1f5646a789e4b21db51c764b514 --- tests/dg_tests.py (.../dg_tests.py) (revision 0448a5c20523f3bd085494b5f797c833a3a0e46d) +++ tests/dg_tests.py (.../dg_tests.py) (revision 2f84b99b836aa1f5646a789e4b21db51c764b514) @@ -563,7 +563,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: @@ -657,40 +657,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() @@ -699,13 +665,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() @@ -715,8 +681,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()) @@ -733,20 +697,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) - #hd.valves.cmd_set_hd_valve_position(0, 1) - #sleep(0.5) - #hd.valves.cmd_set_hd_valve_position(1, 1) - #leep(0.5) - #hd.valves.cmd_set_hd_valve_position(2, 1) - #sleep(0.5) - #hd.valves.cmd_set_hd_valve_position(3, 1) - #sleep(0.5)