Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r84b54a6a2e4478c49853f461b8e1ba560441f147
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 84b54a6a2e4478c49853f461b8e1ba560441f147)
@@ -38,6 +38,7 @@
 #include "Level.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
+#include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "ModeGenPermeate.h"
 #include "ModeGenPermeateDefeatured.h"
@@ -278,10 +279,10 @@
     { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testPreGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
-    { MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,              &testDryBiCartBicarbMixVolControlKiGainOverride },
-    { MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,              &testDryBiCartAcidMixVolControlKpGainOverride },
-    { MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,                &testDryBiCartAcidMixVolControlKpGainOverride },
-    { MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,                &testDryBiCartAcidMixVolControlKiGainOverride },
+    { MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,              &testMixingControlBicarbVolControlKiGainOverride },
+    { MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,              &testMixingControlBicarbVolControlKpGainOverride },
+    { MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,                &testMixingControlAcidVolControlKpGainOverride },
+    { MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,                &testMixingControlAcidVolControlKiGainOverride },
     { MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST,                             &testDryBiCartUpperCartPressureOverride },
     { MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST,                             &testDryBiCartLowerCartPressureOverride } ,
     { MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST,                                     &testSetFPOperationSubMode },