Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -rc85d9f0a8023fabdf1cd557965958d225e2b9085
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c85d9f0a8023fabdf1cd557965958d225e2b9085)
@@ -20,8 +20,11 @@
 #include "reg_system.h"
 
 #include "Conductivity.h"
-#include "ConcentratePumps.h"
 #include "Compatible.h"
+#include "ConcentratePumps.h"
+#include "DialysatePumps.h"
+#include "Heaters.h"
+#include "Level.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
@@ -104,6 +107,16 @@
     MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
     MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST,
     MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      //30
+    MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_TARGET_PRESSURE_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_CURRENT_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_DIRECTION_OVERRIDE_REQUEST,                    //35
+    MSG_ID_DD_HEATERS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST,
+    MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST,
 };
 
 /// Message handling function table
@@ -136,7 +149,17 @@
     &testMeasuredTemperatureOverride,
     &testTemperatureReadCounterOverride,
     &testBaroTemperatureReadCounterOverride,
-    &testBaroTemperatureCRCOverride
+    &testBaroTemperatureCRCOverride,
+    &testDialysatePumpsDataPublishIntervalOverride,                                    //30
+    &testDialysatePumpTargetSpeedOverride,
+    &testDialysatePumpMeasuredSpeedOverride,
+    &testDialysatePumpTargetPressureOverride,
+    &testDialysatePumpMeasuredCurrentOverride,
+    &testDialysatePumpMeasuredDirectionOverride,                                       //35
+    &testHeatersDataPublishIntervalOverride,
+    &testHeaterDutyCycleOverride,
+    &testLevelsDataPublishIntervalOverride,
+    &testLevelStatusOverride,
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))