Index: dialin/dg/calibration_record.py =================================================================== diff -u -r3e0a859c326e8d99732e055a6ec42fab4ebbba3a -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- dialin/dg/calibration_record.py (.../calibration_record.py) (revision 3e0a859c326e8d99732e055a6ec42fab4ebbba3a) +++ dialin/dg/calibration_record.py (.../calibration_record.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -212,10 +212,8 @@ self.attach(observer) while not observer.received: sleep(0.1) - print(self.dg_calibration_record) self._utilities.write_excel_record_to_fw_record(self.dg_calibration_record, report_address, self._CAL_RECORD_TAB_NAME) - print(self.dg_calibration_record) self.cmd_set_dg_calibration_record(self.dg_calibration_record) Index: dialin/hd/sw_config.py =================================================================== diff -u -r4ec12397809c5820ee654aaffe5924e67a79a072 -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- dialin/hd/sw_config.py (.../sw_config.py) (revision 4ec12397809c5820ee654aaffe5924e67a79a072) +++ dialin/hd/sw_config.py (.../sw_config.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -24,26 +24,28 @@ SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS = 4 SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS = 5 SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS = 6 - SW_CONFIG_DISABLE_SYRINGE_PUMP = 7 - SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS = 8 - SW_CONFIG_DISABLE_PRESSURE_CHECKS = 9 - SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK = 10 - SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK =11 - SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK = 12 - SW_CONFIG_DISABLE_CALIBRATION_CHECK = 13 - SW_CONFIG_DISABLE_ALARMS_DEBUG = 14 - SW_CONFIG_ENABLE_ALARM_VOLUME_DEFAULT_LOW = 15 - SW_CONFIG_DISABLE_BATTERY_COMMUNICATION = 16 - SW_CONFIG_DISABLE_AIR_BUBBLE_CHECK = 17 - SW_CONFIG_DISABLE_OCCLUSION_SELF_TEST = 18 - SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST = 19 - SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM = 20 - SW_CONFIG_DISABLE_UI_INTERACTION = 21 - SW_CONFIG_DISABLE_SAMPLE_WATER = 22 - SW_CONFIG_DISABLE_CONSUMABLES_TESTS = 23 - SW_CONFIG_DISABLE_DRY_SELF_TESTS = 24 - SW_CONFIG_DISABLE_PRIMING = 25 - SW_CONFIG_DISABLE_WET_SELF_TEST = 26 + SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS = 7 + SW_CONFIG_DISABLE_SYRINGE_PUMP = 8 + SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS = 9 + SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS = 10 + SW_CONFIG_DISABLE_PRESSURE_CHECKS = 11 + SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK = 12 + SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK = 13 + SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK = 14 + SW_CONFIG_DISABLE_CALIBRATION_CHECK = 15 + SW_CONFIG_DISABLE_ALARMS_DEBUG = 16 + SW_CONFIG_ENABLE_ALARM_VOLUME_DEFAULT_LOW = 17 + SW_CONFIG_DISABLE_BATTERY_COMMUNICATION = 18 + SW_CONFIG_DISABLE_AIR_BUBBLE_CHECK = 19 + SW_CONFIG_DISABLE_OCCLUSION_SELF_TEST = 20 + SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST = 21 + SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM = 22 + SW_CONFIG_DISABLE_UI_INTERACTION = 23 + SW_CONFIG_DISABLE_SAMPLE_WATER = 24 + SW_CONFIG_DISABLE_CONSUMABLES_TESTS = 25 + SW_CONFIG_DISABLE_DRY_SELF_TESTS = 26 + SW_CONFIG_DISABLE_PRIMING = 27 + SW_CONFIG_DISABLE_WET_SELF_TEST = 28 class HDSoftwareConfigs(AbstractSubSystem): Index: dialin/utils/nv_ops_utils.py =================================================================== diff -u -r3e0a859c326e8d99732e055a6ec42fab4ebbba3a -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 3e0a859c326e8d99732e055a6ec42fab4ebbba3a) +++ dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -245,6 +245,12 @@ write_to_excel(self._excel_workbook, self._record_name, row, col, spec, protect_cell=True) col += 1 + + # If the spec is cal_time and the value is not 0, it means it has been calibrated and + # the time is in epoch. Convert that to date and time. + spec_value = self.get_current_date_time(spec_value) if spec == self._CAL_TIME_NAME and \ + spec_value is not 0 else spec_value + # If the spec value that is read is crc, then the value must be protected too. This is # to make sure the crc is not changed by accident by the user so the calibration fails # in the firmware Index: tests/dg_nvm_scripts.py =================================================================== diff -u -rbe8a844a39195fc593bcf79b1c1b2b3add33436a -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision be8a844a39195fc593bcf79b1c1b2b3add33436a) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -4,20 +4,25 @@ dg = DG(log_level="DEBUG") - # NOTE: For further details, please refer to 'Instructions to Calibrate a Device Using the Calibration Report' in - # the development section of the DevOps OneNote file + if dg.cmd_log_in_to_dg(): - # Comment and un-comment any of the functions that you would like to use or you can use your own scripts. + # NOTE: For further details, please refer to 'Instructions to Calibrate a Device Using the Calibration Report' + # in the development section of the DevOps OneNote file - # Use cmd_get_dg_calibration_record_report() to get the calibration record in an excel - # This function gets an address to locate the report there (i.e. /home/fw/projects/) - # 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.calibration_record.cmd_get_dg_calibration_record_report() + # Comment and un-comment any of the functions that you would like to use or you can use your own scripts. - # 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-02-10-DG-Record.xlsx') + # Use cmd_get_dg_calibration_record_report() to get the calibration record in an excel + # This function gets an address to locate the report there (i.e. /home/fw/projects/) + # 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.calibration_record.cmd_get_dg_calibration_record_report() + # 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-02-10-DG-Record.xlsx') + + # For resetting the calibration record to benign values, use the function below + dg.calibration_record.cmd_reset_dg_calibration_record() + Index: tests/dg_tests.py =================================================================== diff -u -r4ec12397809c5820ee654aaffe5924e67a79a072 -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- tests/dg_tests.py (.../dg_tests.py) (revision 4ec12397809c5820ee654aaffe5924e67a79a072) +++ tests/dg_tests.py (.../dg_tests.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -561,10 +561,14 @@ # 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_hd_fans_info()) + sleep(1) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -rbe8a844a39195fc593bcf79b1c1b2b3add33436a -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision be8a844a39195fc593bcf79b1c1b2b3add33436a) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) @@ -4,20 +4,25 @@ hd = HD(log_level="DEBUG") - # NOTE: For further details, please refer to 'Instructions to Change the Software Configurations Dynamically' in - # the development section of the DevOps OneNote file + if hd.cmd_log_in_to_hd(): - # Comment and un-comment any of the functions that you would like to use or you can use your own scripts. + # NOTE: For further details, please refer to 'Instructions to Change the Software Configurations Dynamically' in + # the development section of the DevOps OneNote file - # Use cmd_get_hd_sw_config_record() to get the software configurations record in an excel - # This function gets an address to locate the report there (i.e. /home/fw/projects/) - # It creates a folder called HD_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. - hd.sw_configs.cmd_get_hd_sw_config_record() + # Comment and un-comment any of the functions that you would like to use or you can use your own scripts. - # Use cmd_update_hd_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 - hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-02-08-HD-SW-CONFIGS-Record.xlsx') + # Use cmd_get_hd_sw_config_record() to get the software configurations record in an excel + # This function gets an address to locate the report there (i.e. /home/fw/projects/) + # It creates a folder called HD_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. + hd.sw_configs.cmd_get_hd_sw_config_record() + # Use cmd_update_hd_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 + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-02-10-HD-SW-CONFIGS-Record.xlsx') + + # Use this function to reset the configuration records to all be 0 + hd.sw_configs.cmd_reset_hd_sw_config_record() +