Index: dialin/common/msg_ids.py
===================================================================
diff -u -raa38884ffae56e67897e1ea53108c4a950bdd998 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision aa38884ffae56e67897e1ea53108c4a950bdd998)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -7,8 +7,8 @@
 #
 # @file    msg_ids.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      06-Oct-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      18-Oct-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
@@ -63,7 +63,7 @@
     MSG_ID_DG_RESERVOIRS_DATA = 0x28
     MSG_ID_DG_SAMPLE_WATER_CMD = 0x29
     MSG_ID_DG_VALVES_STATES = 0x2A
-    MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0x2B
+    MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD = 0x2B
     MSG_ID_DG_HEATERS_DATA = 0x2C
     MSG_ID_DG_TEMPERATURE_DATA = 0x2D
     MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E
@@ -239,7 +239,7 @@
     MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018
     MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019
     MSG_ID_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE = 0x801A
-    MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET = 0x801B
+    MSG_ID____AVAILABLE_11 = 0x801B
     MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C
     MSG_ID_SET_RTC_DATE_TIME = 0x801D
     MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E
@@ -419,7 +419,7 @@
     MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046
     MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047
     MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0xA048
-    MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0xA049
+    MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0xA049
     MSG_ID_DG_GET_SW_CONFIG_RECORD = 0xA04A
     MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B
     MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r1ceb44f1f6d97ce295db7c3233043df9cca35746 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 1ceb44f1f6d97ce295db7c3233043df9cca35746)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -7,8 +7,8 @@
 #
 # @file    dialysate_generator.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      08-Aug-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      13-Oct-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
Index: dialin/dg/temperatures.py
===================================================================
diff -u -raa38884ffae56e67897e1ea53108c4a950bdd998 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- dialin/dg/temperatures.py	(.../temperatures.py)	(revision aa38884ffae56e67897e1ea53108c4a950bdd998)
+++ dialin/dg/temperatures.py	(.../temperatures.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -7,8 +7,8 @@
 #
 # @file    temperatures.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      30-Aug-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      13-Oct-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  01-Dec-2021`
 #
Index: tests/dg_tests.py
===================================================================
diff -u -raa38884ffae56e67897e1ea53108c4a950bdd998 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- tests/dg_tests.py	(.../dg_tests.py)	(revision aa38884ffae56e67897e1ea53108c4a950bdd998)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -7,8 +7,8 @@
 #
 # @file    dg_tests.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      06-Oct-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      18-Oct-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Jan-2022
 #
@@ -699,7 +699,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
     #collect_hd_treatment()
 
@@ -739,5 +739,7 @@
     #    print(get_ro_info())
     #    sleep(1)
 
-    #dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
+    dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
+    sleep(1)
+    dg.heaters.cmd_start_stop_trimmer_heater(0)
 
Index: tests/hd_nvm_scripts.py
===================================================================
diff -u -raa38884ffae56e67897e1ea53108c4a950bdd998 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision aa38884ffae56e67897e1ea53108c4a950bdd998)
+++ tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -8,7 +8,7 @@
 # @file    hd_nvm_scripts.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      04-Sep-2022
+# @date    (last)      18-Oct-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  10-Feb-2022
 #
Index: tests/test_flush.py
===================================================================
diff -u -rd759d3a2a1aed849da9ad9153f268eb9f8b1f6f6 -r17704a8e40bbc201bbf46712891b99fffb798e7c
--- tests/test_flush.py	(.../test_flush.py)	(revision d759d3a2a1aed849da9ad9153f268eb9f8b1f6f6)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 17704a8e40bbc201bbf46712891b99fffb798e7c)
@@ -8,7 +8,7 @@
 # @file    test_flush.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      26-Jul-2022
+# @date    (last)      19-Sep-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Apr-2021
 #