Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rc85d9f0a8023fabdf1cd557965958d225e2b9085 -r48ca7fd644c67920acc29a80b7af379d0a134d1a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c85d9f0a8023fabdf1cd557965958d225e2b9085)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 48ca7fd644c67920acc29a80b7af379d0a134d1a)
@@ -26,6 +26,8 @@
 #include "Heaters.h"
 #include "Level.h"
 #include "Messaging.h"
+#include "ModeStandby.h"
+#include "ModeGenDialysate.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressure.h"
@@ -117,6 +119,17 @@
     MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST,
     MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST,
+    MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                               //40
+    MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST,
+    MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,
+    MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_START_OVERRIDE_REQUEST,
+    MSG_ID_DD_DIALYSATE_PUMPS_STOP_OVERRIDE_REQUEST,                                  //45
+    MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONCENTRATE_PUMPS_START_OVERRIDE_REQUEST,
+    MSG_ID_DD_HEATERS_START_OVERRIDE_REQUEST,
+    MSG_ID_DD_HEATERS_STOP_OVERRIDE_REQUEST,
+    MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,                               //50
 };
 
 /// Message handling function table
@@ -160,6 +173,17 @@
     &testHeaterDutyCycleOverride,
     &testLevelsDataPublishIntervalOverride,
     &testLevelStatusOverride,
+    &testTDCommunicationStatus,                                                        //40
+    &testDDOpModePublishIntervalOverride,
+    &testSetOperationMode,
+    &testDDstartGenDialysateOverride,
+    &testDialysatePumpStartOverride,
+    &testDialysatePumpStopOverride,                                                    //45
+    &testDDGenDialysateDataPublishIntervalOverride,
+    &testConcentratePumpStartOverride,
+    &testHeaterStartOverride,
+    &testHeaterStopOverride,
+    &testValveOpenCloseStateOverride,                                                  //50
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))