Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rb6411a65e0c78fe8b296c047a1d6940c55fa64f5 -r7c29e738c37a25cc72d68686d852e087f2f1577d
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision b6411a65e0c78fe8b296c047a1d6940c55fa64f5)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 7c29e738c37a25cc72d68686d852e087f2f1577d)
@@ -59,7 +59,7 @@
 #define BICARB_TARGET_CONDUCTIVITY                  2714.0F                                                 ///< Target bicarb conductivity
 #define BICARB_DELTA_CONDUCTIVITY                   500.0F                                                  ///< Delta bicarb conductivity
 
-#define DIALYSATE_TARGET_CONDUCTIVITY               3734.87F                                                ///< Target dialysate conductivity
+#define DIALYSATE_TARGET_CONDUCTIVITY               13734.87F                                               ///< Target dialysate conductivity
 #define DIALYSATE_DELTA_CONDUCTIVITY                700.0F                                                  ///< Delta dialysate conductivity
 
 // this is for reference only , it can be removed later
@@ -324,6 +324,14 @@
 
      mixingControlDataPublicationTimerCounter               = 0;
 
+     initializePIController( PI_CONTROLLER_ID_BICARB_VOL, 0.0F,\
+                                getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\
+                                    MIN_BICARB_VOLUME_ML, MAX_BICARB_VOLUME_ML, FALSE, MIX_NO_FEED_FORWARD );
+
+     initializePIController( PI_CONTROLLER_ID_ACID_VOL, 0.0F, \
+                                getAcidKpGainCoefficient(), getAcidKiGainCoefficient(),\
+                                    MIN_ACID_VOLUME_ML, MAX_ACID_VOLUME_ML, FALSE, MIX_NO_FEED_FORWARD );
+
 }
 
 /*********************************************************************//**
@@ -845,7 +853,7 @@
         data.currentBicarbMixVolume                     = getBicarbMixVol();
         data.lastBicarbMixVolume                        = lastBicarbMixVolume;
         data.currentAcidMixVolume                       = getAcidMixVol();
-        data.currentAcidMixVolume                       = lastAcidMixVolume;
+        data.lastAcidMixVolume                          = lastAcidMixVolume;
 
         //TODO :broadcast theretical pre and post conductivity