Index: dialin/dg/sw_configs.py =================================================================== diff -u -re0221f00fe32642b76d4a03c61e3f5ce2da2c881 -r8407f6a1eb2289ed5764423aa9f27615d313d6af --- dialin/dg/sw_configs.py (.../sw_configs.py) (revision e0221f00fe32642b76d4a03c61e3f5ce2da2c881) +++ dialin/dg/sw_configs.py (.../sw_configs.py) (revision 8407f6a1eb2289ed5764423aa9f27615d313d6af) @@ -32,27 +32,29 @@ class DGSWConfigs(DialinEnum): # NOTE: NUM_OF enum has been removed because it should be a part of the software configuration # structure since the members of this class is for looped to create the dictionary automatically - SW_CONFIG_DISABLE_HEATERS_AND_TEMPS = 0 + SW_CONFIG_DISABLE_TRIMMER_HEATER = 0 SW_CONFIG_DISABLE_ACCELS = 1 SW_CONFIG_DISABLE_CAL_CHECK = 2 SW_CONFIG_DISABLE_HEATERS_MONITOR = 3 - SW_CONFIG_DISBALE_DRAIN_PUMP_MONITOR = 4 + SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR = 4 SW_CONFIG_DISABLE_RO_PUMP_MONITOR = 5 SW_CONFIG_DISABLE_RO_RATIO_CHECK = 6 SW_CONFIG_DISABLE_COND_SENSOR_CHECK = 7 - SW_CONFIG_DISBALE_WATER_QAULITY_CHECK = 8 - SW_CONFIG_DISBALE_FLOW_LOAD_CELL_CHECK_IN_FILL = 9 + SW_CONFIG_DISABLE_WATER_QUALITY_CHECK = 8 + SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL = 9 SW_CONFIG_DISABLE_HEATERS_EFFICIENCY = 10 - SW_CONFIG_DISBALE_DISINFECT_CONDUCTIVITY_CHECK = 11 - SW_CONFIG_DISABLE_CAPS_MONITOR = 12 - SW_CONFIG_DISBALE_UV_REACTORS = 13 - SW_CONFIG_DISABLE_ACID_ALARMS = 14 - SW_CONFIG_DISABLE_BICARB_ALARMS = 15 - SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM = 16 - SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST = 17 - SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST = 18 - SW_CONFIG_DISABLE_DIALYSATE_CHECK = 19 - SW_CONFIG_DISABLE_MIXING_IN_FILL = 20 + SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK = 11 + SW_CONFIG_DISABLE_CONC_PUMPS = 12 + SW_CONFIG_DISABLE_CAPS_MONITOR = 13 + SW_CONFIG_DISABLE_UV_REACTORS = 14 + SW_CONFIG_DISABLE_ACID_ALARMS = 15 + SW_CONFIG_DISABLE_BICARB_ALARMS = 16 + SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM = 17 + SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST = 18 + SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST = 19 + SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM = 20 + SW_CONFIG_DISABLE_MIXING_IN_FILL = 21 + SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM = 22 class DGSoftwareConfigs(AbstractSubSystem): @@ -103,8 +105,7 @@ """ # Get the default software configuration dictionary self.dg_sw_config_record = self._prepare_dg_sw_configs_record() - # Calculate the CRC for reset software configuration record - self._utilities.reset_fw_system_service_record(self.dg_sw_config_record) + status = self._cmd_set_dg_sw_config_record() return status @@ -316,4 +317,4 @@ while not observer.received: sleep(0.1) # Write the updated values from excel to firmware - self._utilities.write_sw_config_to_excel(self.dg_sw_config_record) + self._utilities.write_sw_config_to_excel(self.dg_sw_config_record, self._FIRMWARE_STACK_NAME) Index: dialin/hd/sw_configs.py =================================================================== diff -u -r919fc382f49f1d88cab6cc89207d75064245fea7 -r8407f6a1eb2289ed5764423aa9f27615d313d6af --- dialin/hd/sw_configs.py (.../sw_configs.py) (revision 919fc382f49f1d88cab6cc89207d75064245fea7) +++ dialin/hd/sw_configs.py (.../sw_configs.py) (revision 8407f6a1eb2289ed5764423aa9f27615d313d6af) @@ -73,6 +73,7 @@ SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP = 38 SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP = 39 SW_CONFIG_DISABLE_SWITCHES_MONITOR = 40 + SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C = 41 class HDSoftwareConfigs(AbstractSubSystem): Index: tests/dg_tests.py =================================================================== diff -u -re0221f00fe32642b76d4a03c61e3f5ce2da2c881 -r8407f6a1eb2289ed5764423aa9f27615d313d6af --- tests/dg_tests.py (.../dg_tests.py) (revision e0221f00fe32642b76d4a03c61e3f5ce2da2c881) +++ tests/dg_tests.py (.../dg_tests.py) (revision 8407f6a1eb2289ed5764423aa9f27615d313d6af) @@ -628,3 +628,4 @@ # test_hd_fans_alarms() # test_dg_fans_alarms() + Index: tests/hd_nvm_scripts.py =================================================================== diff -u -re0221f00fe32642b76d4a03c61e3f5ce2da2c881 -r8407f6a1eb2289ed5764423aa9f27615d313d6af --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision e0221f00fe32642b76d4a03c61e3f5ce2da2c881) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 8407f6a1eb2289ed5764423aa9f27615d313d6af) @@ -32,7 +32,7 @@ # 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-04-17-HD-SW-CONFIGS-Record.xlsx') + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-04-20-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()