Index: tests/dg_nvm_scripts.py =================================================================== diff -u -re8e24c91409226c335960c7bddb5ab5edee0aeca -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision e8e24c91409226c335960c7bddb5ab5edee0aeca) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -54,7 +54,7 @@ # 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-05-03-DG-Record.xlsx') + dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-15-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() @@ -66,9 +66,9 @@ if dg.cmd_log_in_to_dg(): - run_sw_configs_commands() + #run_sw_configs_commands() - #run_calibration_commands() + run_calibration_commands() #dg.usage_record.cmd_get_dg_usage_info_record() #dg.usage_record.cmd_update_dg_usage_info_record('/home/fw/projects/DG_NV_Records/2022-04-22-DG-Record.xlsx') Index: tests/dg_tests.py =================================================================== diff -u -re6c27d820ba1e0dc880f2242a8b11103aa4d3807 -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/dg_tests.py (.../dg_tests.py) (revision e6c27d820ba1e0dc880f2242a8b11103aa4d3807) +++ tests/dg_tests.py (.../dg_tests.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -17,6 +17,7 @@ from dialin.dg.dialysate_generator import DG from dialin.hd.hemodialysis_device import HD +from dialin.ui.hd_simulator import HDSimulator from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates from dialin.dg.heat_disinfect import HeatCancellationModes from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates @@ -634,17 +635,19 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment() # test_hd_fans_alarms() # test_dg_fans_alarms() #while True: - # print(get_dg_fans_info()) + # print(get_temperature_sensors_info()) #print(hd.hd_debug_events) # sleep(1) - #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1) + ui = HDSimulator() + ui.cmd_send_hd_operation_mode(3, 1) + Index: tests/hd_blood_leak_data.py =================================================================== diff -u -re8e24c91409226c335960c7bddb5ab5edee0aeca -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision e8e24c91409226c335960c7bddb5ab5edee0aeca) +++ tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -41,6 +41,9 @@ hd.cmd_log_in_to_hd() sleep(1) + hd.blood_leak.cmd_blood_leak_zero_request() + + """ #hd.blood_leak.cmd_blood_leak_data_broadcast_interval_override(50) hd.blood_leak.cmd_blood_leak_set_to_embedded_mode() @@ -75,7 +78,6 @@ - """ f = open("/home/fw/projects/dialin/tests/blood_leak.log", "w") try: Index: tests/peter/set_RTCs.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/peter/set_RTCs.py (.../set_RTCs.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ tests/peter/set_RTCs.py (.../set_RTCs.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -39,11 +39,13 @@ current_time.tm_year) print("Successfully set HD rtc") - #if dg.cmd_log_in_to_dg(): - # dg.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec, - # current_time.tm_min, - # current_time.tm_hour, - # current_time.tm_mday, - # current_time.tm_mon, - # current_time.tm_year) - # print("Successfully set DG rtc") + """ + if dg.cmd_log_in_to_dg(): + dg.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec, + current_time.tm_min, + current_time.tm_hour, + current_time.tm_mday, + current_time.tm_mon, + current_time.tm_year) + print("Successfully set DG rtc") + """ Index: tests/peter/test_dg_records.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/peter/test_dg_records.py (.../test_dg_records.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ tests/peter/test_dg_records.py (.../test_dg_records.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -327,7 +327,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']) @@ -361,6 +361,6 @@ # test_dg_sw_config_record() #test_dg_calibration_record() # test_dg_service_record() - #test_dg_system_record() + test_dg_system_record() # test_dg_scheduled_runs_record() - test_dg_excel_report() + #test_dg_excel_report() Index: tests/peter/test_hd_records.py =================================================================== diff -u -re8e24c91409226c335960c7bddb5ab5edee0aeca -rc7c9198f7c16d6661ae35e67d02e5b46af14065d --- tests/peter/test_hd_records.py (.../test_hd_records.py) (revision e8e24c91409226c335960c7bddb5ab5edee0aeca) +++ tests/peter/test_hd_records.py (.../test_hd_records.py) (revision c7c9198f7c16d6661ae35e67d02e5b46af14065d) @@ -124,7 +124,7 @@ f.write(record_old_formatted) hd.system_record.hd_system_record['system_record']['top_level_pn'][1] = 'ASD-S123' - hd.system_record.hd_system_record["system_record"]["top_level_sn"][1] = 'ASD-S1234' + hd.system_record.hd_system_record["system_record"]["top_level_sn"][1] = 'HD_Device_00000' hd.system_record.hd_system_record["system_record"]["mfg_location"][1] = 9 hd.system_record.hd_system_record["system_record"]["crc"][1] = \ NVOpsUtils.get_group_record_crc(hd.system_record.hd_system_record["system_record"]) @@ -165,6 +165,8 @@ #test_hd_calibration_record() #test_hd_service_record() #test_hd_reset_system_record() - test_hd_system_record() + #test_hd_system_record() # test_crc() - # test_hd_system_record() + test_hd_system_record() + +