Index: tests/peter/test_dg_records.py =================================================================== diff -u -r3e92417e035803f1401d5818f0117859ee049d9e -racd09d02879e8add4cf7f694f5db8e423a76c341 --- tests/peter/test_dg_records.py (.../test_dg_records.py) (revision 3e92417e035803f1401d5818f0117859ee049d9e) +++ tests/peter/test_dg_records.py (.../test_dg_records.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) @@ -1,14 +1,14 @@ ########################################################################### # -# Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +# Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file test_dg_records.py # # @author (last) Dara Navaei -# @date (last) 15-Dec-2021 +# @date (last) 23-Jun-2022 # @author (original) Dara Navaei # @date (original) 20-Jul-2021 # @@ -24,7 +24,7 @@ sys.path.append("../../") from dialin.dg.dialysate_generator import DG from dialin.utils.nv_ops_utils import NVOpsUtils -from dialin.dg.sw_config import SWConfigs +from dialin.dg.sw_configs import DGSWConfigs from time import sleep """ @@ -189,7 +189,7 @@ while not observer.received: sleep(0.2) """ - #dg.sw_configs.dg_sw_config_record['sw_configs'][SWConfigs.SW_CONFIG_DISABLE_HEATERS_MONITOR.name][1] = 1 + #dg.sw_configs.dg_sw_config_record['sw_configs'][DGSWConfigs.SW_CONFIG_DISABLE_HEATERS_MONITOR.name][1] = 1 #print(dg.sw_configs.dg_sw_config_record) #dg.sw_configs.cmd_set_dg_sw_config_record(dg.sw_configs.dg_sw_config_record) @@ -208,14 +208,14 @@ sleep(0.2) print(dg.calibration_record.dg_calibration_record) - + """ dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']['offset'][1] = 0.885 dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']["crc"][1] = \ NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']) - """ + # Change the value(s) you are planning to change directly to the dictionary dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppi"]["fourth_order"][1] = 0.0 dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppi"]["gain"][1] = 1.0 @@ -228,47 +228,79 @@ dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]["crc"][1] = \ - NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]) + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]) + """ - dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["gain"][1] = 1.0 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["gain"][1] = 0.971227 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["offset"][1] = -13.7163 dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["crc"][1] = \ NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]) - """ - dg.calibration_record.cmd_set_dg_calibration_record(dg.calibration_record.dg_calibration_record) + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["gain"][1] = 0.980796 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["offset"][1] = -34.9747 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]) + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["gain"][1] = 1.006039 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["offset"][1] = 26.75222 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]) + + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["gain"][1] = 1.01493 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["offset"][1] = 133.4312 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]) + print(dg.calibration_record.dg_calibration_record) - record_old_formatted = pprint.pformat(dg.calibration_record.dg_calibration_record, indent=4) - with open("/home/fw/projects/dialin/tests/peter/dg_cal_record.log", 'w') as f: - f.write(record_old_formatted) + dg.calibration_record.cmd_set_dg_calibration_record(dg.calibration_record.dg_calibration_record) + #print(dg.calibration_record.dg_calibration_record) + + #record_old_formatted = pprint.pformat(dg.calibration_record.dg_calibration_record, indent=4) + #with open("/home/fw/projects/dialin/tests/peter/dg_cal_record.log", 'w') as f: + # f.write(record_old_formatted) + #subprocess.call("meld /home/fw/projects/dialin/tests/peter/dialin_test_record_old.log" # " /home/fw/projects/dialin/tests/peter/dialin_test_record_new.log", shell=True) def test_dg_reset_record(): dg = DG(log_level="DEBUG") if dg.cmd_log_in_to_dg(): + """ + dg.calibration_record.cmd_request_dg_calibration_record() + observer = Observer("dg_calibration_record") + dg.calibration_record.attach(observer) + while not observer.received: + sleep(0.2) + print(dg.calibration_record.dg_calibration_record) + + dg.calibration_record.cmd_reset_dg_calibration_record() + sleep(0.25) + print(dg.calibration_record.dg_calibration_record) + """ #dg.calibration_record.cmd_reset_dg_calibration_record() #sleep(0.25) - #print(dg.calibration_record.dg_calibration_record) - - #dg.scheduled_runs_record.cmd_reset_dg_calibration_record() - #sleep(0.25) dg.system_record.cmd_reset_dg_system_record() - sleep(0.25) - print(dg.system_record.dg_system_record) - dg.service_record.cmd_reset_dg_service_record() - sleep(0.25) - print(dg.service_record.dg_service_record) + #sleep(0.25) + #print(dg.system_record.dg_system_record) + #dg.service_record.cmd_reset_dg_service_record() + #sleep(0.25) + #print(dg.service_record.dg_service_record) - def test_dg_service_record(): + dg = DG(log_level="DEBUG") if dg.cmd_log_in_to_dg(): @@ -296,7 +328,7 @@ while not observer.received: sleep(0.2) - dg.system_record.dg_system_record['system_record']['top_level_sn'][1] = 'abc-345' + dg.system_record.dg_system_record['system_record']['top_level_sn'][1] = 'DG_Device_00000' dg.system_record.dg_system_record['system_record']['top_level_pn'][1] = '123' dg.system_record.dg_system_record['system_record']['crc'][1] = \ NVOpsUtils.get_group_record_crc(dg.system_record.dg_system_record['system_record']) @@ -317,11 +349,19 @@ dg.scheduled_runs_record.cmd_set_dg_scheduled_runs_record(dg.scheduled_runs_record.dg_scheduled_runs_record) +def test_dg_excel_report(): + dg = DG(log_level="DEBUG") + if dg.cmd_log_in_to_dg(): + dg.calibration_record.cmd_get_dg_calibration_record_report() + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-02-10-DG-Record.xlsx') + + if __name__ == "__main__": - # test_dg_reset_record() - test_dg_sw_config_record() + test_dg_reset_record() + # test_dg_sw_config_record() #test_dg_calibration_record() # test_dg_service_record() #test_dg_system_record() # test_dg_scheduled_runs_record() + #test_dg_excel_report()