Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -r8d2a2aec6986e58a1f6f75d4ba8864ee689fde48
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8d2a2aec6986e58a1f6f75d4ba8864ee689fde48)
@@ -17,6 +17,7 @@
 
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "Heaters.h"
 #include "ModePreGenDialysate.h"
 #include "ModeGenDialysate.h"
@@ -57,6 +58,7 @@
 static void publishPreGenDialysateState( void );
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenDialysateFillCompleteCheckState( void );
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenWetSelfTestState( void );
+static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartFillCheckState( void );
 
 //Wet Self test
 static void setModePreGenWetSelfStateTransition( DD_WET_SELF_TEST_STATE_T state );
@@ -144,6 +146,10 @@
                 preGenDialysateState = handlePreGenWetSelfTestState();
                 break;
 
+            case DD_PRE_GEN_DRY_BICART_FILL_CHECK:
+                preGenDialysateState = handleDryBicartFillCheckState();
+                break;
+
             case DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND:
                 // TODO : handle wait for Gen dialysate
                 break;
@@ -241,15 +247,52 @@
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenWetSelfTestState( void )
 {
     //TODO: Change to wet self test state later
-    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
+    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
 
+    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_DRY_BICART_FILL ) == TRUE )
+    {
+        setValveState( D14_VALV, VALVE_STATE_OPEN );
+        setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+
+    }
+
     //execWetSelfTest();
 
     return state;
 }
 
+
 /*********************************************************************//**
  * @brief
+ * The handleDryBicartFillCheckState function executes intial dryy bicart fill request
+ * @details \b Inputs: state
+ * @details \b Outputs: none
+ * @return current state of PreGenDialysate mode
+ *************************************************************************/
+static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartFillCheckState( void )
+{
+    //TODO: Change to wet self test state later
+    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
+
+    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_DRY_BICART_FILL ) == TRUE )
+    {
+        setBicartFillRequested();
+
+        if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
+        {
+             state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
+        }
+    }
+    else
+    {
+        state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The setModePreGenWetSelfStateTransition function sets the actuators and variables
  * for the state transition in pre-gen WetSlef test mode.
  * @details Inputs: Valve states, Pump speed