Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rdb2df05586608658c7bbd0dbd66aeba03068b16d -r96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision db2df05586608658c7bbd0dbd66aeba03068b16d)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66)
@@ -37,12 +37,12 @@
 
 #define DRY_BICART_DATA_PUBLISH_INTERVAL            ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
 #define DRY_BICART_FILL_MAX_PRESSURE           	    12.0F					                    ///< Maximum pressure that drybicart can withstand.
-#define DRY_BICART_FILL_COMPLETE_PRESSURE           10.0F					                    ///< Maximum pressure reached to inidcate the drybicart fill being completed.
+#define DRY_BICART_FILL_COMPLETE_PRESSURE           15.0F					                    ///< Maximum pressure reached to inidcate the drybicart fill being completed.
 #define DRY_BICART_FILL_INITIATE_PRESSURE           5.0F					                    ///< Minimum pressure required to initiate the drybicart fill process.
-#define DRY_BICART_VENT_COMPLETE_PRESSURE           0.0F                                        ///< Pressure reached to inidcate the drybicart venting being completed.
+#define DRY_BICART_VENT_COMPLETE_PRESSURE           1.5F                                        ///< Pressure reached to inidcate the drybicart venting being completed.
 #define DRY_BICART_VENT_TIME_MS                     ( 1 * MS_PER_SECOND )                       ///< Wait time to vent dry bibag gas before actuating Bicarb chamber(F) venting.
 #define DRY_BICART_VENT_MAX_TIME_MS                 ( 10 * MS_PER_SECOND )                      ///< Max time to vent both bicart and Chamber F.
-#define DRY_BICART_FILL_DURATION_DIFF_MS            500                                         ///< Fill duration difference between last and current fill cycle.
+#define DRY_BICART_FILL_DURATION_DIFF_MS            800                                         ///< Fill duration difference between last and current fill cycle.
 #define DRY_BICART_DEFAULT_MAX_FILL_CYCLE_CNT       10                                          ///< Default max fill cycle allowed for dry bicart fill/mix with water.
 #define DRY_BICART_MAX_FILL_CYCLE_CNT               30                                          ///< Max fill cycle allowed (by override) for dry bicart fill/mix with water.
 
@@ -96,8 +96,8 @@
     dryBiCartDataPublishInterval.ovData        	= DRY_BICART_DATA_PUBLISH_INTERVAL;
     dryBiCartDataPublishInterval.ovInitData    	= 0;
     dryBiCartDataPublishInterval.override      	= OVERRIDE_RESET;
-    biCartMaxFillCycleCount.data                = DRY_BICART_MAX_FILL_CYCLE_CNT;
-    biCartMaxFillCycleCount.ovData              = DRY_BICART_MAX_FILL_CYCLE_CNT;
+    biCartMaxFillCycleCount.data                = DRY_BICART_DEFAULT_MAX_FILL_CYCLE_CNT;
+    biCartMaxFillCycleCount.ovData              = DRY_BICART_DEFAULT_MAX_FILL_CYCLE_CNT;
     biCartMaxFillCycleCount.ovInitData          = 0;
     biCartMaxFillCycleCount.override            = OVERRIDE_RESET;
     dryBiCartFillRequested.data                 = FALSE;
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558 -r96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66)
@@ -265,8 +265,8 @@
                  ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID )  || ( M4_VALV == valveID )  || ( D23_VALV == valveID )  ||
                  ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID )  ||
                  ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D80_VALV == valveID ) || ( D81_VALV == valveID ) || ( D79_PMP_VALV == valveID )   ||
-                 ( P11_VALV == valveID ) || ( P33_VALV == valveID ) || ( P34_VALV == valveID ) || ( P37_VALV == valveID ) || ( P6_VALV == valveID ) ||
-                 ( M12_VALV == valveID ) || ( P39_VALV == valveID ) )
+                 ( D85_VALV == valveID ) || ( P11_VALV == valveID ) || ( P33_VALV == valveID ) || ( P34_VALV == valveID ) || ( P37_VALV == valveID ) ||
+                 ( P6_VALV == valveID )  || ( M12_VALV == valveID ) || ( P39_VALV == valveID ) )
             {
                 result = TRUE;
             }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -r96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 67731d57db9a620418b3b848d8f75ff204902c36)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 96672fa4b57d15c36d8aaa73d6f50ea0fe7fda66)
@@ -21,6 +21,7 @@
 #include "Heaters.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
+#include "ModeGenDialysate.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 //#include "NVDataMgmt.h"
@@ -154,6 +155,9 @@
 {
     DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_IDLE;
 
+    //Testing
+    //hydChamberWaterInletControl();
+
     //TODO : Define comm loss alarm when TD is turned off or stops communicating
 //    if ( FALSE == isTDCommunicating() )
 //    {