Index: tests/dg_tests.py =================================================================== diff -u -r32051e30ac8cadc047131366e937966983394f7c -r75dda6c6a7700bfbd75006ea1c4e312ed2db399b --- tests/dg_tests.py (.../dg_tests.py) (revision 32051e30ac8cadc047131366e937966983394f7c) +++ tests/dg_tests.py (.../dg_tests.py) (revision 75dda6c6a7700bfbd75006ea1c4e312ed2db399b) @@ -74,13 +74,13 @@ info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' - 'Total_rinse_count, {}, Top_alarm, {}, ' + 'Total_rinse_count, {}, Top_alarm, {}, chem_acid_avg_cond, {:5.3f}, ' .format(state, overall_elapsed_time, state_elapsed_time, dg.chemical_disinfect.chemical_disinfect_target_time, ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, - dg.chemical_disinfect_flush.rinse_count, - hd.alarms.alarm_top)) + dg.chemical_disinfect_flush.rinse_count, hd.alarms.alarm_top, + dg.chemical_disinfect.acid_average_cond_us_per_cm)) return info @@ -282,15 +282,16 @@ def get_temperature_sensors_info(): info = ('TPi, {:5.3f}, THd, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, ' - 'Baro_temp, {:5.3f}, ' + 'Baro_temp, {:5.3f}, TDi_mving_avg, {:5.3f}, TRo_mving_avg, {:5.3f}, ' .format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.HEAT_DISINFECT.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name], dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name], - dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name])) + dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name], + dg.temperatures.dialysate_inlet_moving_avg, dg.temperatures.redundant_outlet_moving_avg)) return info @@ -442,6 +443,9 @@ hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS.value) sleep(0.5) hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK.value) + sleep(0.5) + hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WORN_CARTRIDGE.value) + sleep(0.5) #dg.hd_proxy.cmd_start_stop_dg() #sleep(4) @@ -567,11 +571,12 @@ def run_chemical_disinfect(): complete_counter = 1 - f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") + base_dir = os.getcwd() + f = open(os.path.join(base_dir, "chemical_disinfect.log"), "w") dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() - #dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) + dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) try: while True: @@ -725,9 +730,9 @@ #run_flush_mode() - run_chemical_disinfect() + #run_chemical_disinfect() - #hd.alarms.cmd_alarm_state_override(301, 1) + #hd.alarms.cmd_alarm_state_override(319, 1) #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense() #run_dg() @@ -747,9 +752,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) @@ -765,3 +770,5 @@ # sleep(1) + +