Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r145fd716a856f864f39fb0f9884865f6e45b9256 -ra08bda2a0610a27e3147fed72e1aca7b798a1bb0
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 145fd716a856f864f39fb0f9884865f6e45b9256)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision a08bda2a0610a27e3147fed72e1aca7b798a1bb0)
@@ -725,16 +725,18 @@
             PI_CONTROLLER_SIGNALS_DATA debugBicarbControl;
             F32 measuredBicarbConductivity = getFilteredConductivity( D17_COND );
             F32 bicarbConductivity = getBicarbTargetConductivity();//getBicarbConductivityPre();
+            //TODO: ALARM if measuredDialysateConductivity or bicarbConductivity is or both 0
 
             if ( fabs ( bicarbConductivity - measuredBicarbConductivity ) > BICARB_DEADBAND_CONTROL )
             {
-                bicarbMixVol = runPIController( PI_CONTROLLER_ID_BICARB_VOL, getBicarbConductivityPre() /*getBicarbTargetConductivity()*/, measuredBicarbConductivity );
+                bicarbMixVol = runPIController( PI_CONTROLLER_ID_BICARB_VOL, bicarbConductivity, measuredBicarbConductivity );
                 //Set bicarb mix vol only if its above dead band threshold, else use the previous set vlaue
+                // Note: bicarb volume will impact the D10 pump , if volume is set to 0 , then D10 doesn't run
                 setBicarbMixVol( bicarbMixVol );
             }
             else
             {
-                //use the previous value
+                //use the previous value, this is for debug
                 lastBicarbMixVolume = getBicarbMixVol();
             }
 
@@ -757,16 +759,18 @@
             F32 measuredDialysateConductivity = getFilteredConductivity( D27_COND );
             F32 DialysateConductivity  = getDialysateTargetConductivity();//getTotalConductivity();
             PI_CONTROLLER_SIGNALS_DATA debugAcidControl;
+            //TODO: ALARM if measuredDialysateConductivity or DialysateConductivity is or both 0
 
             if ( fabs ( DialysateConductivity - measuredDialysateConductivity ) > ACID_DEADBAND_CONTROL )
             {
                 acidMixVol = runPIController( PI_CONTROLLER_ID_ACID_VOL, DialysateConductivity, measuredDialysateConductivity );
                 // set acid mix volume if its above dead band threshold , else use previous set value
+                // Note: if acid volume is set as 0, then D11 pump doesn't run
                 setAcidMixVol( acidMixVol );
             }
             else
             {
-                // use the previous value
+                // use the previous value, this is for debug
                 lastAcidMixVolume = getAcidMixVol();
             }