Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9)
@@ -54,13 +54,12 @@
 /// PI Controllers -- initial configurations.
 static PI_CONTROLLER_T piControllers[ NUM_OF_PI_CONTROLLERS_IDS ] =
 {   // Kp   Ki  uMax  uMin  ref meas  err  esw esum ctrl
-    { 0.0, 0.0,  1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_ULTRAFILTRATION
-    { 0.0, 0.0, 0.90, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_BLOOD_FLOW
-    { 0.0, 0.0, 0.90, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }   // PI_CONTROLLER_ID_DIALYSATE_FLOW
+
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_RO_PUMP
+    { 0.0, 0.0, 0.89, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },  // PI_CONTROLLER_ID_PRIMARY_HEATER
+    { 0.0, 0.0, 0.50, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }   // PI_CONTROLLER_ID_TRIMMER_HEATER
 };
 
-/**@}*/
-
 /*********************************************************************//**
  * @brief
  * Initialize controller before operation. Make sure to call it before
@@ -172,23 +171,6 @@
             controller->errorSum -= ( windupError / controller->Ki );
         }
         result = controller->controlSignal;
-//#ifdef DEBUG_ENABLED
-//    {
-//        // TODO - temporary debug code - remove later
-//        char debugFlowStr[ 100 ];
-//        S32  nums = (S32)(measuredSignal);
-//        S32  decs = (S32)(fabs(measuredSignal-(S32)(measuredSignal))*100.0);
-//        S32  nume = (S32)controller->errorSignal;
-//        S32  dece = (S32)(fabs(controller->errorSignal-(S32)controller->errorSignal)*100.0);
-//        S32  numes = (S32)controller->errorSum;
-//        S32  deces = (S32)((controller->errorSum-(S32)(controller->errorSum))*100.0);
-//        S32  nump = (S32)controller->controlSignal;
-//        S32  decp = (S32)((controller->controlSignal-(S32)controller->controlSignal)*10000.0);
-//
-//        sprintf( debugFlowStr, "%6d.%02d  %6d.%02d  %10d.%02d  %3d.%04d\n", nums, decs, nume, dece, numes, deces, nump, decp );
-//        sendDebugData( (U08*)debugFlowStr, strlen(debugFlowStr) );
-//    }
-//#endif
     }
     else
     {
@@ -264,4 +246,3 @@
 }
 
 /**@}*/
-