Index: dialin/hd/calibration_record.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -212,10 +212,9 @@
         groups_byte_size = 0
         # create a list of the functions of the sub dictionaries
         functions = [self._prepare_pumps_record(), self._prepare_valves_record(),
-                     self._prepare_occlusion_sensors_record(), self._prepare_flow_sensors_record(),
-                     self._prepare_pressure_sensors_record(), self._prepare_temperature_sensors_record(),
-                     self._prepare_heparin_force_sensor_record(), self._prepare_accelerometer_sensor_record(),
-                     self._prepare_blood_leak_sensor_record()]
+                     self._prepare_occlusion_sensors_record(), self._prepare_pressure_sensors_record(),
+                     self._prepare_temperature_sensors_record(), self._prepare_heparin_force_sensor_record(),
+                     self._prepare_accelerometer_sensor_record(), self._prepare_blood_leak_sensor_record()]
 
         for function in functions:
             # Update the groups bytes size so far to be use to padding later
@@ -294,7 +293,7 @@
 
         @return: occlusion sensors hardware group dictionary and the byte size of this hardware group
         """
-        hardware_names = ['ob', 'odi', 'odo']
+        hardware_names = ['ob']
 
         group_byte_size = 0
         group_name = 'occlusion_sensors'
@@ -313,31 +312,6 @@
 
         return hardware_group, group_byte_size
 
-    def _prepare_flow_sensors_record(self):
-        """
-        Handles creating the calibration_record dictionary of the flow sensors hardware group.
-
-        @return: flow sensors hardware group dictionary and the byte size of this hardware group
-        """
-        hardware_names = ['fmb', 'fmd']
-
-        group_byte_size = 0
-        group_name = 'flow_sensors'
-        hardware_group = OrderedDict({group_name: OrderedDict()})
-        hardware = OrderedDict()
-
-        for i in hardware_names:
-            hardware[i] = {'fourth_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
-                           'third_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
-                           'second_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
-                           'gain': ['<f', self._DEFAULT_GAIN_VALUE], 'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
-                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE], 'crc': ['<H', self._DEFAULT_CRC_VALUE]}
-            # Calculate the size of the bytes in this hardware group
-            group_byte_size += self._utilities.calculate_group_byte_size(hardware[i])
-        hardware_group[group_name] = hardware
-
-        return hardware_group, group_byte_size
-
     def _prepare_pressure_sensors_record(self):
         """
         Handles creating the calibration_record dictionary of the pressure sensors hardware group.
@@ -369,7 +343,7 @@
 
         @return: temperature sensors hardware group dictionary and the byte size of this hardware group
         """
-        hardware_names = ['board_temp_1', 'board_temp_2', 'board_temp_3', 'power_supply']
+        hardware_names = ['onboard_ntc', 'power_supply_1', 'fpga_board', 'venous_pres', 'pba_adc']
 
         group_byte_size = 0
         group_name = 'temperature_sensors'
Index: dialin/hd/sw_config.py
===================================================================
diff -u -r8841ca865ff616ea3de171bc4037c349aaac7934 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- dialin/hd/sw_config.py	(.../sw_config.py)	(revision 8841ca865ff616ea3de171bc4037c349aaac7934)
+++ dialin/hd/sw_config.py	(.../sw_config.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -19,7 +19,7 @@
     # structure since the members of this class is for looped to create the dictionary automatically
     SW_CONFIG_DISABLE_ALARM_AUDIO = 0
     SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM = 1
-    SW_CONFIG_DSIABLE_ACK_ERRORS = 2
+    SW_CONFIG_DISABLE_ACK_ERRORS = 2
     SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE = 3
     SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS = 4
     SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS = 5
@@ -43,7 +43,7 @@
     SW_CONFIG_DISABLE_CONSUMABLES_TESTS = 23
     SW_CONFIG_DISABLE_DRY_SELF_TESTS = 24
     SW_CONFIG_DISABLE_PRIMING = 25
-    SW_CONFIG_DISABLE_WE_SELF_TEST = 26
+    SW_CONFIG_DISABLE_WET_SELF_TEST = 26
 
 
 class HDSoftwareConfigs(AbstractSubSystem):
@@ -290,7 +290,6 @@
 
          @return: none
          """
-
         # Create the excel report
         self._utilities.prepare_excel_report(self._FIRMWARE_STACK_NAME, self._NON_VOLATILE_RECORD_NAME, report_address)
         # Request the latest software configuration record from firmware
@@ -303,4 +302,4 @@
         while not observer.received:
             sleep(0.1)
         # Write the updated values from excel to firmware
-        self._utilities.write_sw_config_to_excel(self.hd_sw_config_record)
+        self._utilities.write_sw_config_to_excel(self.hd_sw_config_record, self._FIRMWARE_STACK_NAME)
Index: dialin/utils/excel_ops.py
===================================================================
diff -u -radae506afce35a0063c6c2baf7e8580986f3bee7 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- dialin/utils/excel_ops.py	(.../excel_ops.py)	(revision adae506afce35a0063c6c2baf7e8580986f3bee7)
+++ dialin/utils/excel_ops.py	(.../excel_ops.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -194,14 +194,26 @@
     active_sheet.merge_cells(str(merge_start_cell) + ':' + str(merge_end_cell))
 
 
-def save_report(excel_workbook, save_dir, record_name):
+def save_report(excel_workbook, save_dir, record_name, stack_name=None):
     """
     This function overrides the save function in the Base class. The function saves the excel file.
 
+    @param excel_workbook: Excel workbook object
+    @param save_dir: Saving directory
+    @param record_name: Type of recored being saved (i.e. calibration, software configuration)
+    @param stack_name: Name of the software stack name (i.e. HD) default none
+
     @returns none
     """
+    address = ''
     # Get the current date
     current_date = str(datetime.datetime.now().date())
+    # Some of the records might want to add the name of the stack. For instance, software configurations might want to
+    # mention that this is an HD or DG software configuration report.
+    if stack_name is not None:
+        address = current_date + '-' + str(stack_name) + '-' + str(record_name).upper() + '-Record.xlsx'
+    else:
+        address = current_date + '-' + str(record_name).upper() + '-Record.xlsx'
     # Create the save path by using the path, date and current code review excel count out of total number of them
-    path = os.path.join(save_dir, current_date + '-' + str(record_name).upper() + '-Record.xlsx')
+    path = os.path.join(save_dir, address)
     excel_workbook.save(filename=path)
Index: dialin/utils/nv_ops_utils.py
===================================================================
diff -u -r4264a946469e93087db5ec00492ec374cdfd6ac5 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 4264a946469e93087db5ec00492ec374cdfd6ac5)
+++ dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -478,7 +478,7 @@
             # Get the list of keys of the main dictionary (i.e. pressure_sensors, temperature_sensors, ....}
             # These keys are the list of hardware groups
             for group in cal_record.keys():
-                # All the hardware groups (i.e pressure sensors) are nested dictionaries, except the final CRC. So it is
+                # All the hardware groups (i.e. pressure sensors) are nested dictionaries, except the final CRC. It is
                 # unpacked here. The CRC is an unsigned 16-bit (short).
                 if group == 'crc':
                     # Get the data type ( it must be '<H')
@@ -710,7 +710,7 @@
         Prepares the record packets prior to sending to firmware
 
         @param new_record: (OrderedDict) the dictionary that is processed to be sent down
-        @param group: (str) dictionary group that is being processed (i.e service_records)
+        @param group: (str) dictionary group that is being processed (i.e. service_records)
         @param key: dictionary key of the current group
         @param temp_buffer: List temporary buffer that is holding the values to be converted to bytes
         @param current_payload_length: (int) current payload length of the temporary buffer (before it gets to
@@ -870,11 +870,12 @@
 
         return padding_size
 
-    def write_sw_config_to_excel(self, sw_configs: OrderedDict):
+    def write_sw_config_to_excel(self, sw_configs: OrderedDict, stack_name):
         """
         Publicly accessible function to write the software configurations into an excel report
 
         @param sw_configs: (ordered dictionary) the configurations record to write to excel
+        @param stack_name: (str) the name of the software stack (i.e. HD)
 
         @return none
         """
@@ -894,10 +895,14 @@
         for key, values in sw_configs['sw_configs'].items():
 
             write_to_excel(self._excel_workbook, self._record_name, row, names_col_number, key, bold=True)
-            write_to_excel(self._excel_workbook, self._record_name, row, values_col_number, values[1])
+            # 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
+            write_to_excel(self._excel_workbook, self._record_name, row, values_col_number, config_value, color=color)
             row += 1
 
-        save_report(self._excel_workbook, self._workspace_dir, 'SW-Configs')
+        save_report(self._excel_workbook, self._workspace_dir, 'SW-Configs', stack_name=stack_name)
 
     def get_sw_configs_from_excel(self, sw_configs_dict: OrderedDict, excel_path: str, sw_config_excel_tab: str):
         """
Index: tests/peter/test_dg_records.py
===================================================================
diff -u -r8841ca865ff616ea3de171bc4037c349aaac7934 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision 8841ca865ff616ea3de171bc4037c349aaac7934)
+++ tests/peter/test_dg_records.py	(.../test_dg_records.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -253,15 +253,15 @@
     dg = DG(log_level="DEBUG")
     if dg.cmd_log_in_to_dg():
 
-        #dg.calibration_record.cmd_reset_dg_calibration_record()
+        dg.calibration_record.cmd_reset_dg_calibration_record()
         #sleep(0.25)
         #print(dg.calibration_record.dg_calibration_record)
 
-        dg.calibration_record.cmd_reset_dg_calibration_record()
-        sleep(0.25)
-        dg.system_record.cmd_reset_dg_system_record()
-        sleep(0.25)
-        print(dg.system_record.dg_system_record)
+        #dg.calibration_record.cmd_reset_dg_calibration_record()
+        #sleep(0.25)
+        #dg.system_record.cmd_reset_dg_system_record()
+        #sleep(0.25)
+        #print(dg.system_record.dg_system_record)
         #dg.service_record.cmd_reset_dg_service_record()
         #sleep(0.25)
         #print(dg.service_record.dg_service_record)
Index: tests/peter/test_hd_records.py
===================================================================
diff -u -r6286da1bcfac5f1d43659196fb1baf27af50d746 -rdc3b97933c58b8854781f2984083a2f8eccd3217
--- tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision 6286da1bcfac5f1d43659196fb1baf27af50d746)
+++ tests/peter/test_hd_records.py	(.../test_hd_records.py)	(revision dc3b97933c58b8854781f2984083a2f8eccd3217)
@@ -47,10 +47,14 @@
         while not observer.received:
             sleep(0.2)
 
+        #print(hd.calibration_record.hd_calibration_record)
+
+        """
         # store the old record after reading it from fw
         record_old_formatted = pprint.pformat(hd.calibration_record.hd_calibration_record, indent=4)
         with open("/home/fw/projects/dialin/tests/peter/hd_cal_record.log", 'w') as f:
             f.write(record_old_formatted)
+        """
 
         hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["y_offset"][1] = 2.0
         hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["cal_time"][1] = \
@@ -70,6 +74,7 @@
         hd.calibration_record.cmd_set_hd_calibration_record(hd.calibration_record.hd_calibration_record)
 
 
+
 def test_hd_reset_calibration_record():
     hd = HD(log_level="DEBUG")
     if hd.cmd_log_in_to_hd(resend=False):
@@ -96,10 +101,10 @@
     hd = HD(log_level="DEBUG")
     if hd.cmd_log_in_to_hd(resend=False):
 
-        hd.calibration_record.cmd_reset_hd_calibration_record()
+        #hd.calibration_record.cmd_reset_hd_calibration_record()
         #print(hd.calibration_record.hd_calibration_record)
         #hd.system_record.cmd_reset_hd_system_record()
-        #hd.service_record.cmd_reset_hd_service_record()
+        hd.service_record.cmd_reset_hd_service_record()
         #print(hd.service_record.hd_service_record)
 
 
@@ -136,8 +141,8 @@
         #hd.sw_configs.cmd_reset_hd_sw_config_record()
         #sleep(2)
 
-        #hd.sw_configs.cmd_get_hd_sw_config_record('/home/fw/')
-        hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-01-26-SW-CONFIGS-Record.xlsx')
+        hd.sw_configs.cmd_get_hd_sw_config_record()
+        #hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-02-03-HD-SW-CONFIGS-Record.xlsx')
         #dg.sw_configs.cmd_set_dg_sw_config_record('/home/fw/DG_NV_Records/2022-01-22-SW-CONFIGS-Record.xlsx')
 
         """
@@ -154,10 +159,10 @@
 
 if __name__ == "__main__":
 
-    test_hd_reset_record_record()
-    #test_hd_sw_config_record()
+    #test_hd_reset_record_record()
+    test_hd_sw_config_record()
     #test_hd_calibration_record()
-    # test_hd_service_record()
+    #test_hd_service_record()
     #test_hd_reset_system_record()
     #test_hd_system_record()
     # test_crc()