Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -rf0c77deb1d6f38f6bedb5ced326cdc85715fe15f -r4e57fcb909cbabb6f08ab2cffd339e99a2fc2f64 --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision f0c77deb1d6f38f6bedb5ced326cdc85715fe15f) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 4e57fcb909cbabb6f08ab2cffd339e99a2fc2f64) @@ -1,47 +1,60 @@ -import sys -sys.path.append("..") from dialin.dg.dialysate_generator import DG -from dialin.dg.heat_disinfect import HeatDisinfectStates, CancellationModes -from dialin.dg.chemical_disinfect import ChemicalDisinfectStates, CancellationModes +<<<<<<< HEAD +from dialin.common.dg_defs import HeatStates, HeatDisinfectUIStates +======= +from dialin.hd.hemodialysis_device import HD +from dialin.common.dg_defs import HeatDisinfectStates, HeatDisinfectUIStates +>>>>>>> DEN-9480-dialysate-temperature-control +from dialin.dg.heat_disinfect import HeatCancellationModes +from dialin.common.dg_defs import ChemicalDisinfectStates, ChemDisinfectUIStates +from dialin.dg.chemical_disinfect import ChemCancellationModes from dialin.dg.drain_pump import DrainPumpStates from dialin.dg.thermistors import ThermistorsNames from dialin.dg.temperature_sensors import TemperatureSensorsNames from dialin.dg.dialysate_generator import DGOperationModes -from dialin.dg.valves import * +from dialin.hd.temperatures import HDTemperaturesNames from time import sleep +from datetime import datetime +import sys +sys.path.append("..") def get_chemical_disinfect_mode_info(): + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' - 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f}, ' - 'Current_rinse_count, {}, Total_rinse_count, {}, ' + 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' + 'Total_rinse_count, {}, UI_state, {}, ' .format(ChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name, dg.chemical_disinfect.overall_elapsed_time, dg.chemical_disinfect.state_elapsed_time, - dg.chemical_disinfect.disinfect_elapsed_time, - CancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, - (dg.chemical_disinfect.r1_level - dg.load_cells.load_cell_A1), dg.chemical_disinfect.r2_level, - (dg.chemical_disinfect.r2_level - dg.load_cells.load_cell_B1), - dg.chemical_disinfect.current_post_rinse_count, dg.chemical_disinfect.target_post_rinse_count)) + dg.chemical_disinfect.chemical_disinfect_elapsed_time, + ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, + dg.chemical_disinfect.r2_level, dg.chemical_disinfect.current_post_rinse_count, + dg.chemical_disinfect.target_post_rinse_count, + ChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name)) return info def get_concentrate_pumps_info(): - pass - # TODO add concentrate pumps and the conductivity sensors information + info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, ' + .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, + dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, + dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, + dg.conductivity_sensors.conductivity_sensor_cd2)) + return info + def get_heat_disinfect_mode_info(): info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' - 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f} ' + 'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {} ' .format(HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time, - dg.heat_disinfect.disinfect_elapsed_time, - CancellationModes(dg.heat_disinfect.cancellation_mode).name, dg.heat_disinfect.r1_level, - (dg.heat_disinfect.r1_level - dg.load_cells.load_cell_A1), dg.heat_disinfect.r2_level, - (dg.heat_disinfect.r2_level - dg.load_cells.load_cell_B1))) + dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level, + dg.heat_disinfect.r2_level, hd.alarms.alarm_top, + HeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name)) return info @@ -99,22 +112,30 @@ return info +def get_heaters_with_no_temp_info(): + + info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, ' + 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. + format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, + dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, + dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) + return info + + def get_heaters_info(): - info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, ' + info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, ' 'Prim_TC_temp, {:5.3f}, Trimmer_DC, {:5.3f}, Trim_int_temp, {:5.3f}, Trim_CJ_temp, {:5.3f}, ' - 'Trim_TC_temp, {:5.3f}, Prim_TC_raw, {:5.3f}, Prim_CJ_raw, {:5.3f}, Trimmer_TC_raw, {:5.3f}, ' - 'Trimmer_CJ_raw, {:5.3f}, Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. + 'Trim_TC_temp, {:5.3f}, Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, + dg.heaters.primary_heater_state, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name], dg.heaters.trimmer_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name], - dg.temperature_sensors.primary_raw_thermo_couple, dg.temperature_sensors.primary_raw_cold_junc, - dg.temperature_sensors.trimmer_raw_thermo_couple, dg.temperature_sensors.trimmer_raw_cold_junc, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) return info @@ -131,79 +152,267 @@ return info -def get_fans_info(): +def get_dg_fans_info(): - info = ('Target_fans_DC, {:5.3f}, Inlet1_RPM, {:5.3f}, Outlet1_RPM, {:5.3f}, ' - 'Inlet2_RPM, {:5.3f}, Outlet2_RPM, {:5.3f}, Inlet3_RPM, {:5.3f}, Outlet3_RPM, {:5.3f}, Board_temp, {:5.3f},' - ' FPGA_temp, {:5.3f}, Load_cell_A1_B1, {:5.3f}, Load_cell_A2_B2, {:5.3f}, ' - .format(dg.fans.target_duty_cycle, dg.fans.inlet_1_rpm, dg.fans.inlet_2_rpm, dg.fans.inlet_2_rpm, + info = ('Target_fans_DC, {:5.3f}, Inlet1_RPM, {:5.3f}, Outlet1_RPM, {:5.3f}, Inlet2_RPM, {:5.3f}, ' + 'Outlet2_RPM, {:5.3f}, Inlet3_RPM, {:5.3f}, Outlet3_RPM, {:5.3f}, Board_temp, {:5.3f}, ' + 'Power_supply_1, {:5.3f}, Power_supply_2, {:5.3f}, FPGA_temp, {:5.3f}, Load_cell_A1_B1, {:5.3f}, ' + 'Load_cell_A2_B2, {:5.3f}, ' + .format(dg.fans.dg_fans_duty_cycle, dg.fans.inlet_1_rpm, dg.fans.inlet_2_rpm, dg.fans.inlet_2_rpm, dg.fans.outlet_2_rpm, dg.fans.inlet_3_rpm, dg.fans.outlet_3_rpm, dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_ONBOARD_NTC.name], + dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_1.name], + dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_2.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.FPGA_BOARD_SENSOR.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A1_B1.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A2_B2.name])) return info +def get_hd_fans_info(): + + info = ('HD_Fan_DC, {:5.3f}, Target_HD_RPM, {:5.3f}, Inlet1_RPM, {:5.3f}, HD_Board_temp, {:5.3f}, ' + 'HD_Power_supply, {:5.3f}, HD_FPGA_temp, {:5.3f}, PBA_ADC_temp, {:5.3f}, Venous_temp, {:5.3f}, ' + .format(hd.fans.duty_cycle, hd.fans.target_rpm, hd.fans.inlet_1_rpm, + hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_ONBOARD_NTC.name], + hd.temperatures.hd_temperatures[HDTemperaturesNames.THERMISTOR_POWER_SUPPLY_1.name], + hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_FPGA_BOARD.name], + hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name], + hd.temperatures.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name])) + return info + + +def cmd_test_heaters(): + + f = open("/home/fw/projects/dialin/tests/test_heaters.log", "w") + + dg.hd_proxy.cmd_start_stop_dg() + sleep(0.1) + + try: + while True: + + """ + command = input() + + # s for stop the heaters + if command == 's': + dg.hd_proxy.cmd_stop_primary_heater() + # e for exit the run and close everything + elif command == 'e': + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + # c for change the flow rate and keep going + elif command == 'c': + pass + #TODO figure out the right command for this + """ + + dg_run = get_dg_run_info() + temperature = get_temperature_sensors_info() + heaters = get_heaters_info() + ro = get_ro_info() + + var = dg_run + temperature + heaters + ro + '\r' + + print(var) + f.write(var) + sleep(1) + + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + + +def run_heaters(): + counter = 1 + timer = 1 + sleep_time = 1 + run_number = 1 + f = open("/home/fw/projects/dialin/tests/run_heaters.log", "w") + + dg.hd_proxy.cmd_start_stop_dg() + sleep(0.1) + + try: + while True: + try: + dg_run = get_dg_run_info() + temperature = get_temperature_sensors_info() + heaters = get_heaters_info() + ro = get_ro_info() + + var = str(run_number) + ', ' + str(timer) + ', ' + dg_run + temperature + heaters + ro + '\r' + + print(var) + f.write(var) + sleep(sleep_time) + + except KeyboardInterrupt: + dg.hd_proxy.cmd_stop_primary_heater() + + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + + def run_dg(): counter = 1 + timer = 0.1 + sleep_time = 1 + run_number = 1 + recirc_delay = 1 f = open("/home/fw/projects/dialin/tests/run_dg.log", "w") + dg.hd_proxy.cmd_start_stop_dg() sleep(0.1) - dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0) - sleep(0.1) try: while True: - dg_run = get_dg_run_info() + temperature = get_temperature_sensors_info() + heaters = get_heaters_with_no_temp_info() load_cell = get_load_cells_info() drain = get_drain_states_info() ro = get_ro_info() + fans = get_dg_fans_info() valves = get_dg_valves_states() - var = str(counter) + ', ' + dg_run + load_cell + drain + ro + valves + '\r' + var = str(datetime.now()) + ', ' + str(run_number) + ', ' + str(recirc_delay) + ', ' + dg_run + \ + temperature + heaters + load_cell + drain + ro + fans + valves + '\r' print(var) f.write(var) - if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2: + if run_number > 5 and dg.dg_operation_sub_mode == 2: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + break - if counter == 1: - dg.valves.cmd_valve_override(VDrVRcStates.VALVE_STATE_RECIRC_C_TO_NC.value, dg.valves.VALVE_DRAIN) + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 1: - if counter == 5: - dg.valves.cmd_valve_override(VDrVRcStates.VALVE_STATE_DRAIN_C_TO_NO.value, dg.valves.VALVE_DRAIN) - dg.valves.cmd_valve_override(VPiVSPVBfVRD1VRD2States.VALVE_STATE_OPEN.value, - dg.valves.VALVE_RESERVOIR_DRAIN_1) + if recirc_delay < 5: + recirc_delay += 1 + else: + if timer == 1: + dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1) + timer += 1 - if counter == 6: + if timer > ((1/sleep_time) * 1): + timer = 1 + recirc_delay = 1 + counter += 1 - dg.drain_pump.cmd_drain_pump_speed_set_point_override(2100) - + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 2: + dg.hd_proxy.cmd_drain(tare_load_cell=True) counter += 1 + timer = 1 - """" - if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 3: + + timer += 1 + if timer > 4: + dg.hd_proxy.cmd_fill(volume=1700) + counter += 1 + + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 4: + counter = 1 + run_number += 1 + + sleep(sleep_time) + + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + pass + + +def run_ro_pump_duty_cycles(): + + counter = 1 + timer = 0.1 + sleep_time = 1 + run_number = 1 + recirc_delay = 1 + ro_dc = 10 + ro_dc_step = 5 + f = open("/home/fw/projects/dialin/tests/run_ro_pump.log", "w") + + dg.hd_proxy.cmd_start_stop_dg() + sleep(0.1) + dg.ro_pump.cmd_ro_pump_duty_cycle_pct(ro_dc) + sleep(0.1) + + try: + while True: + dg_run = get_dg_run_info() + temperature = get_temperature_sensors_info() + heaters = get_heaters_with_no_temp_info() + load_cell = get_load_cells_info() + drain = get_drain_states_info() + ro = get_ro_info() + fans = get_dg_fans_info() + valves = get_dg_valves_states() + + var = str(datetime.now()) + ', ' + str(run_number) + ', ' + str(ro_dc) + ', ' + dg_run + \ + temperature + heaters + load_cell + drain + ro + fans + valves + '\r' + + print(var) + f.write(var) + + if ro_dc > 95 and dg.dg_operation_sub_mode == 2: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + break + + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 1: + + if recirc_delay < 1: + recirc_delay += 1 + else: + if timer == 1: + dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1) + + timer += 1 + + if timer > ((1/sleep_time) * 1): + timer = 1 + recirc_delay = 1 + counter += 1 + + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ dg.dg_operation_sub_mode == 2 and counter == 2: - dg.hd_proxy.cmd_fill(volume=1700) + dg.hd_proxy.cmd_drain(tare_load_cell=True) counter += 1 - sleep(0.15) + timer = 1 - if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ dg.dg_operation_sub_mode == 2 and counter == 3: - #dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0) - dg.hd_proxy.cmd_drain(volume=50) - counter += 1 - sleep(0.15) - """ - sleep(1) + timer += 1 + if timer > 4: + dg.hd_proxy.cmd_fill(volume=1700) + counter += 1 + + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ + dg.dg_operation_sub_mode == 2 and counter == 4: + counter = 1 + run_number += 1 + ro_dc += ro_dc_step + dg.ro_pump.cmd_ro_pump_duty_cycle_pct(ro_dc) + + sleep(sleep_time) + except KeyboardInterrupt: dg.hd_proxy.cmd_start_stop_dg(start=False) f.close() + pass def run_heat_disinfect(): @@ -215,16 +424,17 @@ try: while True: - disinfect = get_dg_run_info() + disinfect = get_heat_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() - fans = get_fans_info() + dg_fans = get_dg_fans_info() + hd_fans = get_hd_fans_info() - var = disinfect + load_cell + drain + ro + temp + heaters + fans + valves + '\r' + var = disinfect + load_cell + drain + ro + temp + heaters + dg_fans + hd_fans + valves + '\r' print(var) f.write(var) @@ -261,25 +471,24 @@ disinfect = get_chemical_disinfect_mode_info() drain = get_drain_states_info() load_cell = get_load_cells_info() + conc = get_concentrate_pumps_info() valves = get_dg_valves_states() ro = get_ro_info() temp = get_temperature_sensors_info() heaters = get_heaters_info() - fans = get_fans_info() + fans = get_dg_fans_info() - var = disinfect + load_cell + drain + ro + temp + heaters + fans + valves + '\r' + var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r' print(var) f.write(var) sleep(1) # If the mode came back to standby or standby solo if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4: - # If it is the first call, stop heat disinfect - if complete_counter == 1: - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False) + # Write a few more complete states to make sure the complete state items are recorded - elif complete_counter == 3: + if complete_counter == 3: #pass f.close() break @@ -291,16 +500,42 @@ f.close() +def cmd_set_disinfect_ui_screen(): + + hd = HD() + sleep(0.5) + hd.ui.cmd_ui_set_standby_submode_to_disinfect() + + while True: + print(hd.ui.disinfects_hd_submode, hd.ui.disinfects_dg_mode) + sleep(1) + + if __name__ == "__main__": dg = DG(log_level='DEBUG') dg.cmd_log_in_to_dg() sleep(1) + hd = HD(log_level='DEBUG') + hd.cmd_log_in_to_hd() + sleep(1) #run_heat_disinfect() #run_chemical_disinfect() - run_dg() + #run_dg() + run_ro_pump_duty_cycles() + #cmd_set_disinfect_ui_screen() + + #cmd_test_heaters() + + #dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, 0) + #sleep(0.1) + #dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, 0) + + #dg.valves.cmd_valve_override(4, 0) + +