Index: dialin/utils/nv_ops_utils.py =================================================================== diff -u -rf822b55ab067aba716dc07f7fa3f53ef9cb2c9e3 -r72d37aec73383ab55cd5e624a5f2e6dc59c185d5 --- dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision f822b55ab067aba716dc07f7fa3f53ef9cb2c9e3) +++ dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 72d37aec73383ab55cd5e624a5f2e6dc59c185d5) @@ -111,7 +111,7 @@ _SW_CONFIGS_TITLE_COL = 'SW Configurations' _SW_CONFIGS_VALUE_COL = 'Status' - _SW_CONFIGS_REPORT_NAME = 'SW-Configs' + _SW_CONFIGS_REPORT_NAME = 'SW-CONFIGS' _CAL_TIME_NAME = 'cal_time' _NEW_CAL_TIME_SIGNAL = 'new' _CRC_NAME = 'crc' @@ -202,17 +202,19 @@ # in there and it is ignored file = str(file) if self._firmware_stack in file and 'lock' not in file: - if self._SW_CONFIGS_REPORT_NAME in file and self._SW_CONFIGS_REPORT_NAME == record_name and \ - str(datetime.datetime.now().date()) in file: - # Create the file path and exit the loop - path = os.path.join(self._workspace_dir, file) - is_report_found = True - break - elif str(datetime.datetime.now().date()) in file: - # Create the file path and exit the loop - path = os.path.join(self._workspace_dir, file) - is_report_found = True - break + if str(datetime.datetime.now().date()) in file: + if self._SW_CONFIGS_REPORT_NAME in file and self.NON_VOLATILE_RECORD_NAME == record_name: + print(record_name) + # Create the file path and exit the loop + path = os.path.join(self._workspace_dir, file) + is_report_found = True + break + elif self._SW_CONFIGS_REPORT_NAME not in file and self.NON_VOLATILE_RECORD_NAME not in \ + record_name: + # Create the file path and exit the loop + path = os.path.join(self._workspace_dir, file) + is_report_found = True + break if is_report_found: # Load the excel workbook Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r31c0b4a36d8bafbb69e217803546291b1af30f02 -r72d37aec73383ab55cd5e624a5f2e6dc59c185d5 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 31c0b4a36d8bafbb69e217803546291b1af30f02) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 72d37aec73383ab55cd5e624a5f2e6dc59c185d5) @@ -27,12 +27,12 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in your computer. - #dg.sw_configs.cmd_get_dg_sw_config_record() + dg.sw_configs.cmd_get_dg_sw_config_record() # Use cmd_set_dg_sw_config_record() 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.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-06-07-DG-SW-CONFIGS-Record.xlsx') + #dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-06-07-DG-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #dg.sw_configs.cmd_reset_dg_sw_config_record() @@ -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-06-20-DG-Record.xlsx') + #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-20-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() @@ -69,9 +69,9 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in you computer. - #dg.system_record.cmd_get_dg_system_record_report() + dg.system_record.cmd_get_dg_system_record_report() - dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-22-DG-Record.xlsx') + #dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-06-22-DG-Record.xlsx') # For resetting the system record to benign values, use the function below #dg.system_record.cmd_reset_dg_system_record() Index: tests/dg_tests.py =================================================================== diff -u -r31c0b4a36d8bafbb69e217803546291b1af30f02 -r72d37aec73383ab55cd5e624a5f2e6dc59c185d5 --- tests/dg_tests.py (.../dg_tests.py) (revision 31c0b4a36d8bafbb69e217803546291b1af30f02) +++ tests/dg_tests.py (.../dg_tests.py) (revision 72d37aec73383ab55cd5e624a5f2e6dc59c185d5) @@ -626,15 +626,15 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() # test_dg_fans_alarms() #test_dvt_drain_pump() - test_conc_pumps() + #test_conc_pumps() #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1)