Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r577532788d2042e5299fd22aff6bae46c292002d -r6408d79e3a9a543e90b2fa7ab823be348befd391
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 577532788d2042e5299fd22aff6bae46c292002d)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6408d79e3a9a543e90b2fa7ab823be348befd391)
@@ -27,8 +27,10 @@
 #include "Level.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
-#include "ModeStandby.h"
 #include "ModeGenDialysate.h"
+#include "ModePreGenDialysate.h"
+#include "ModePostGenDialysate.h"
+#include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #ifdef __PUMPTEST__
@@ -147,6 +149,12 @@
     MSG_ID_DD_BICARB_DOSING_VOLUME_OVERRIDE_REQUEST,                                  //60
     MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST,
     MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST,
+    MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,
+    MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,
+    MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                          //65
+    MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,
+    MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,
+    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,
@@ -198,7 +206,7 @@
     &testTDCommunicationStatusOverride,                                                //40
     &testDDOpModePublishIntervalOverride,
     &testSetOperationMode,
-    &testDDstartGenDialysateOverride,
+    &testDDStartGenDialysateOverride,
     &testDialysatePumpStartStopOverride,
     &testDDGenDialysateDataPublishIntervalOverride,                                    //45
     &testConcentratePumpStartStopOverride,
@@ -218,6 +226,12 @@
     &testBicarbDoseVolumeOverride,                                                     //60
     &testGenDExecStateOverride,
     &testHeaterPWMPeriodOverride,
+    &testDDPreGenDialysateDataPublishIntervalOverride,
+    &testDDPostGenDialysateDataPublishIntervalOverride,
+    &testDDStartPreGenDialysateOverride,                                              //65
+    &handlePreGenDialysateRequestMsg,
+    &testDDStopPreGenDialysateOverride,
+    &testDDStopGenDialysateOverride,
 #ifdef __PUMPTEST__
     &testDDPistonPumpControlDataPublishIntervalOverride,
     &testDDPistonPumpStartStopOverride,