Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rf364406cd1f672078ca38ae8aad5bc508e9b64dd -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision f364406cd1f672078ca38ae8aad5bc508e9b64dd)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -27,7 +27,6 @@
 #include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "OperationModes.h"
-#include "PIControllers.h"
 #include "PressureSensor.h"
 #include "PersistentAlarm.h"
 #include "Pressure.h"
@@ -280,11 +279,6 @@
     {
         case DRY_BICART_IDLE:
             // run as idle state
-            //DRY_BICART_SUPPLY ;
-            //DRY_BICART_INITIAL_FILL;
-            //DRY_BICART_DRAIN;
-            //default DRY_BICART_IDLE;
-            //the below function select any one of the above request
             updateDrybicartOperation();
             break;
 
@@ -395,7 +389,7 @@
             bicarbChamberFillExecState = handleBicarbChamberCartridgeFillWaterEndState();
             break;
 
-        case BICARB_CHAMBER_FILL_STATE:
+        case BICARB_CHAMBER_SUPPLY_STATE:
             bicarbChamberFillExecState = handleBicarbChamberSupplyStart();
             break;
 
@@ -731,7 +725,7 @@
 {
     DRY_BICART_FILL_EXEC_STATE_T state  = DRY_BICART_FILL_WATER_END_STATE;
     F32 d66Pressure                     = getFilteredPressure( D66_PRES );
-    F32 fillCompletePressure = GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI;
+    F32 fillCompletePressure            = GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI;
 
     // Close dry bicart inlet water if D66 pressure is 17 PSI
     if ( d66Pressure >= fillCompletePressure )
@@ -1015,7 +1009,7 @@
             setValveState( D65_VALV, VALVE_STATE_CLOSED );
             dryBiCartPersistenceStartTime = 0;
 
-            state = BICARB_CHAMBER_FILL_STATE;
+            state = BICARB_CHAMBER_SUPPLY_STATE;
         }
         // 200 ms persistence on D66 pressure since pressure overshoot just after D65 opening
         if ( TRUE == didTimeout( dryBiCartPersistenceStartTime, DRY_BICART_PERSISTENCE_DURATION_MS ) )
@@ -1024,7 +1018,7 @@
             setValveState( D65_VALV, VALVE_STATE_CLOSED );
             dryBiCartPersistenceStartTime = 0;
 
-            state = BICARB_CHAMBER_FILL_STATE;
+            state = BICARB_CHAMBER_SUPPLY_STATE;
         }
     }