Index: dialin/utils/excel_ops.py =================================================================== diff -u -ree278f5a643613b8e7acbc44c3e70ead692cd0f0 -rddf8a289ffc27f86d69a60922ce71d1681b668ce --- dialin/utils/excel_ops.py (.../excel_ops.py) (revision ee278f5a643613b8e7acbc44c3e70ead692cd0f0) +++ dialin/utils/excel_ops.py (.../excel_ops.py) (revision ddf8a289ffc27f86d69a60922ce71d1681b668ce) @@ -28,6 +28,7 @@ YELLOW = PatternFill(start_color='FFFF00', end_color='FFFF00', fill_type='solid') BLUE = PatternFill(start_color='00CCFF', end_color='00CCFF', fill_type='solid') RED = PatternFill(start_color='FF0000', end_color='FF0000', fill_type='solid') +NO_COLOR = PatternFill(fill_type='none') def get_an_excel_workbook(): Index: dialin/utils/nv_ops_utils.py =================================================================== diff -u -r8aae8b70709a9b55fd69c9621d4f1ff7e928e3c2 -rddf8a289ffc27f86d69a60922ce71d1681b668ce --- dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 8aae8b70709a9b55fd69c9621d4f1ff7e928e3c2) +++ dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision ddf8a289ffc27f86d69a60922ce71d1681b668ce) @@ -890,7 +890,6 @@ """ row = 1 names_col_number = 2 - write_to_excel(self._excel_workbook, self._record_name, row, names_col_number, self._SW_CONFIGS_TITLE_COL, bold=True, freeze=True, protect_cell=True) @@ -909,7 +908,7 @@ # Get the configuration value config_value = values[1] # If the config value is not 0, color the cell as green otherwise, leave it none colored - color = GREEN if config_value != 0 else None + color = GREEN if config_value != 0 else NO_COLOR write_to_excel(self._excel_workbook, self._record_name, row, values_col_number, config_value, color=color) row += 1 Index: tests/dg_tests.py =================================================================== diff -u -r7c47b3d1b3c4b685999c0f0a8b402b692391d633 -rddf8a289ffc27f86d69a60922ce71d1681b668ce --- tests/dg_tests.py (.../dg_tests.py) (revision 7c47b3d1b3c4b685999c0f0a8b402b692391d633) +++ tests/dg_tests.py (.../dg_tests.py) (revision ddf8a289ffc27f86d69a60922ce71d1681b668ce) @@ -73,7 +73,14 @@ hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume)) return info +def get_hd_occlusion_pressures_info(): + info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {}, DialIn_pres, {}, DialOut_pres, {}, ' + .format(hd.pressure_occlusion.arterial_pressure, hd.pressure_occlusion.venous_pressure, + hd.pressure_occlusion.blood_pump_occlusion, hd.pressure_occlusion.dialysate_inlet_pump_occlusion, + hd.pressure_occlusion.dialysate_outlet_pump_occlusion)) + return info + def get_hd_reservoirs_info(): info = ('HD_rsrvr_state, {}, Active_rsrvr, {}, Active_rsrvr_uf, {:5.3f}, Active_rsrvr_vol_spent, {:5.3f}, ' 'Dilution_level_pct, {:5.3f}, Recirc_level_pct, {:5.3f}, Time_depletion, {}, Time_wait_to_fill, {}, ' @@ -570,5 +577,5 @@ # test_dg_fans_alarms() while True: - print(get_hd_fans_info()) + print(get_hd_occlusion_pressures_info()) sleep(1) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r8aae8b70709a9b55fd69c9621d4f1ff7e928e3c2 -rddf8a289ffc27f86d69a60922ce71d1681b668ce --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 8aae8b70709a9b55fd69c9621d4f1ff7e928e3c2) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision ddf8a289ffc27f86d69a60922ce71d1681b668ce) @@ -16,12 +16,12 @@ # 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() + #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') + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-02-14-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()