Index: dialin/common/msg_ids.py
===================================================================
diff -u -r962dd8ebc689cd4a61ec614ed2d4f3b2e96a58ed -rcbe423dbeb2e62446251f8e1de73f0eebdaf94ca
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 962dd8ebc689cd4a61ec614ed2d4f3b2e96a58ed)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision cbe423dbeb2e62446251f8e1de73f0eebdaf94ca)
@@ -317,7 +317,7 @@
     MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0XA007
     MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0XA009
     MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0XA00A
-    MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE = 0XA00B
+    MSG_ID_DRAIN_PUMP_SET_RPM = 0XA00B
     MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0XA00C
     MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE = 0XA00D
     MSG_ID_VALVE_STATE_OVERRIDE = 0XA00E
@@ -375,6 +375,7 @@
     MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043
     MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044
     MSG_ID_DG_STOP_RTC_CLOCK = 0xA045
+    MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046
     MSG_ID_HD_DEBUG_EVENT = 0XFFF1
     MSG_ID_DG_DEBUG_EVENT = 0XFFF2
     MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0XFFFF
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r5b791b3c7d1d2498dbe52c4573225a56afffe2fb -rcbe423dbeb2e62446251f8e1de73f0eebdaf94ca
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 5b791b3c7d1d2498dbe52c4573225a56afffe2fb)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision cbe423dbeb2e62446251f8e1de73f0eebdaf94ca)
@@ -140,10 +140,11 @@
 
 def get_heaters_info():
     info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, '
-            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
+            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, '.
             format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle,
                    dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle,
-                   dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature))
+                   dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature,
+                   dg.heaters.primary_efficiency))
     return info
 
 
@@ -297,7 +298,7 @@
                 f.close()
                 break
 
-            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \
+            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_GEN_IDLE.name and \
                 dg.dg_operation_sub_mode == 2 and counter == 1:
 
                 if recirc_delay < 5:
@@ -312,21 +313,21 @@
                         recirc_delay = 1
                         counter += 1
 
-            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \
+            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_GEN_IDLE.name and \
                 dg.dg_operation_sub_mode == 2 and counter == 2:
                 dg.hd_proxy.cmd_drain(tare_load_cell=True)
                 counter += 1
                 timer = 1
 
-            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \
+            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_GEN_IDLE.name and \
                 dg.dg_operation_sub_mode == 2 and counter == 3:
 
                 timer += 1
                 if timer > 4:
                     dg.hd_proxy.cmd_fill(volume=1700)
                     counter += 1
 
-            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \
+            elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_GEN_IDLE.name and \
                 dg.dg_operation_sub_mode == 2 and counter == 4:
                 counter = 1
                 run_number += 1
@@ -553,7 +554,7 @@
 
     # run_chemical_disinfect()
 
-    # run_dg()
+    #run_dg()
 
     # run_ro_pump_duty_cycles()
 
@@ -563,6 +564,32 @@
 
     # cmd_test_heaters()
 
-    collect_treatment_data()
+    # collect_treatment_data()
 
 
+    print(dg.rtc.get_rtc_epoch())
+
+    sleep(0.1)
+
+    #dg.rtc.cmd_stop_rtc()
+
+    dg.rtc.cmd_set_rtc_time_and_date(45, 27, 17, 4, 11, 2021)
+
+    """
+    sleep(6)
+
+    print(dg.rtc.get_rtc_epoch())
+
+    sleep(1)
+
+    dg.rtc.cmd_set_rtc_time_and_date(22, 18, 17, 4, 11, 2021)
+
+    while True:
+        print(dg.rtc.get_rtc_epoch())
+        sleep(1)
+    """
+
+
+
+
+