Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -rcabab4c56b6840c94126b71696d2c95011cb01a0
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision cabab4c56b6840c94126b71696d2c95011cb01a0)
@@ -20,6 +20,7 @@
 #include "FPOperationModes.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
+#include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "ModeInitPOST.h"
 #include "ModePreGenDialysate.h"
@@ -56,6 +57,8 @@
 #define TD_SODIUM_MIN                       ( 130U )                       ///< TD Min acid type index
 #define TD_SODIUM_MAX                       ( 155U )                       ///< TD Max acid type index
 
+
+
 #define TD_BICARBONATE_MIN                  ( 20U )                        ///< TD Min acid type index
 #define TD_BICARBONATE_MAX                  ( 40U )                        ///< TD Max acid type index
 
@@ -149,12 +152,12 @@
     tdBicarbConvFactor.ovInitData       = BICARBONATE_CONVERSION_FACTOR;
     tdBicarbConvFactor.override         = OVERRIDE_RESET;
 
-    tdSodium.data                       = 0.0F;
+    tdSodium.data                       = DIALYSATE_TARGET_STD_NA_SETTINGS;
     tdSodium.ovData                     = 0.0F;
     tdSodium.ovInitData                 = TD_SODIUM_MIN;
     tdSodium.override                   = OVERRIDE_RESET;
 
-    tdBicarbonate.data                  = 0.0F;
+    tdBicarbonate.data                  = DIALYSATE_TARGET_STD_BICARB_SETTING;
     tdBicarbonate.ovData                = 0.0F;
     tdBicarbonate.ovInitData            = TD_BICARBONATE_MIN;
     tdBicarbonate.override              = OVERRIDE_RESET;
@@ -562,7 +565,7 @@
             setTDAcidAndBicarbType( startTxRequest.acidConvFactor, startTxRequest.bicarbConvFactor,
                                     startTxRequest.sodium, startTxRequest.bicarbonate );
             setTDDialyzerBypass( startTxRequest.bypassDialyzer );
-            tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
+            tdSubstitutionFlowRate.data = startTxRequest.substitutionRate;
             setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
             // start dialysate generation
@@ -593,7 +596,7 @@
                 setTDAcidAndBicarbType( startTxRequest.acidConvFactor, startTxRequest.bicarbConvFactor,
                                         startTxRequest.sodium, startTxRequest.bicarbonate );
                 setTDDialyzerBypass( startTxRequest.bypassDialyzer );
-                tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
+                tdSubstitutionFlowRate.data = startTxRequest.substitutionRate;
                 setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
                 // Signal to update treatement parameters