Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rdf87716215d606300dd2617a6854b7071c0ce545 -rb26c5dd805f0c95856456fd16c8fc9c56659f76e
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision df87716215d606300dd2617a6854b7071c0ce545)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision b26c5dd805f0c95856456fd16c8fc9c56659f76e)
@@ -281,8 +281,8 @@
 
     for ( mixId = DIALYSATE_MIX_ID_FIRST; mixId < NUM_OF_DIALYSATE_MIXING_ID; mixId++ )
     {
-        dialysateMix[ mixId ].dialysateMixingState = DIALYSATE_MIXING_OPEN_LOOP_STATE;
-        dialysateMix[ mixId ].controlTimerCounter 	= 0;
+        dialysateMix[ mixId ].dialysateMixingState      = DIALYSATE_MIXING_OPEN_LOOP_STATE;
+        dialysateMix[ mixId ].controlTimerCounter 	    = 0;
     }
 
     dryBiCartDataPublishInterval.data                   = DRY_BICART_DATA_PUBLISH_INTERVAL;
@@ -481,34 +481,30 @@
     {
         case DRY_BICART_IDLE:
             // run as idle state
-            dryBicartSubstate = 0x0;
             break;
 
         case DRY_BICART_INITIAL_FILL:
             // Dry bicart fill exec
-            dryBicartSubstate = execDryBicartFillMode();
+            execDryBicartFillMode();
             break;
 
         case DRY_BICART_SUPPLY:
             // Fill Bicarb chamber F exec
-            dryBicartSubstate = execBicarbChamberFillMode();
+            execBicarbChamberFillMode();
             break;
 
         case DRY_BICART_DRAIN:
             // Dry bicart drain exec
-            dryBicartSubstate = execDryBicartDrainMode();
+            execDryBicartDrainMode();
             break;
 
         default:
             // software fault,
-            dryBicartSubstate = 0x0;
             dryBicartStartRequest = DRY_BICART_IDLE;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DRY_BICART_FILL_INVALID_EXEC_STATE, dryBicartStartRequest );
             break;
     }
 
-    // to avoid compilation warning since this parameter is not used any where
-    (void)dryBicartSubstate;
     // Publish dry bicart data
     publishDryBicartData();
 }
@@ -660,8 +656,6 @@
     return dryBiCartDrainExecState;
 }
 
-
-
 /*********************************************************************//**
  * @brief
  * TThe getBicarbMixVol function gets the bicarb mix volume provided by the controller
@@ -1641,9 +1635,9 @@
     BICARB_CHAMBER_FILL_EXEC_STATE_T state  = BICARB_SUPPLY_VENT_START_STATE;
     float setpoint;
     U32 startTime;
-
     F32 d66Pressure                         = getFilteredPressure( D66_PRES );
-    F32 tmpD66Pressure = getFilteredPressure( D66_PRES );
+    F32 tmpD66Pressure                      = getFilteredPressure( D66_PRES );
+
     setpoint = d66Pressure - 1.0;
 
     if ( ( d66Pressure > DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE ) )
@@ -1922,8 +1916,6 @@
 
         data.dryBiCartFillExecState             = (U32)dryBiCartFillExecState;
         data.bicarbChamberFillExecState         = (U32)bicarbChamberFillExecState;
-        // TODO : temporarily disabled. restore it after testing
-#if 0
         data.dryBiCartDrainExecState            = (U32)dryBiCartDrainExecState;
         data.dryBiCartFillCycleCounter          = biCartFillCycleCounter;
         data.dryBiCartMaxFillCycleCount         = getU32OverrideValue( &biCartMaxFillCycleCount );
@@ -1934,7 +1926,6 @@
         data.dryBiCartCurrentFillTime           = currentFillDurationInMS;
         data.dryBiCartType                      = getU32OverrideValue( &dryBiCartType );
         data.dryBiCartDrainTimePeriod           = dryBiCartDrainTimePeriod;
-#endif
 
         // TODO: remove after feature testing
         memcpy( &data.dryBiCartBicarbDosingControl, &bicarbControlSignals, sizeof( PI_CONTROLLER_SIGNALS_DATA ) );
@@ -2261,7 +2252,6 @@
  * The testDryBiCartUpperCartPressureOverride function sets the override value
  * of bicart upper cart pressure
  * @details Inputs: dryBiCartUpperCartPressure
- *
  * @details Outputs: dryBiCartUpperCartPressure
  * @param message Override message from Dialin which includes the override
  * value to override the  bicart upper cart pressure
@@ -2279,7 +2269,6 @@
  * The testDryBiCartLowerCartPressureOverride function sets the override value
  * of Lowercart pressure
  * @details Inputs: dryBiCartLowerCartPressure
- *
  * @details Outputs: dryBiCartLowerCartPressure
  * @param message Override message from Dialin which includes the override
  * value to override the  bicart lower pressure.