Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -r3aa700c036437377bca1de55bc01307705abf0a5 -r4e35963753273d2481691fceb799ca8d5819309a
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 3aa700c036437377bca1de55bc01307705abf0a5)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 4e35963753273d2481691fceb799ca8d5819309a)
@@ -52,8 +52,8 @@
 #define DRY_BICART_FILL_COMPLETE_TIME_MS                ( 1 * MS_PER_SECOND )                       ///< Wait time to reset the request flag after fill complete
 #define DRY_BICART_WCID2_FILL_COMPLETE_PRESSURE_PSI     ( 10.0F + WCDI2_PRESSURE_OFFSET_PSI )       ///< Maximum pressure reached to indicate the dry bicart fill being completed for WCID2
 #define DRY_BICART_WCID1_FILL_COMPLETE_PRESSURE_PSI     ( 10.0F + WCID1_PRESSURE_OFFSET_PSI )       ///< Maximum pressure reached to indicate the dry bicart fill being completed for WCID1
-#define GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI (getTestConfigStatus( TEST_CONFIG_DD_ENABLE_WCID_1 ) \
-  != TRUE ? DRY_BICART_WCID2_FILL_COMPLETE_PRESSURE_PSI : DRY_BICART_WCID1_FILL_COMPLETE_PRESSURE_PSI )
+#define GET_FILL_COMPLETE_PRESSURE_PSI (getTestConfigStatus( TEST_CONFIG_DD_ENABLE_WCID_1 ) != TRUE ? \
+        DRY_BICART_WCID2_FILL_COMPLETE_PRESSURE_PSI : DRY_BICART_WCID1_FILL_COMPLETE_PRESSURE_PSI ) ///< Get fill complete pressure based on the WCID configuration
 #define DRY_BICART_FILL_INITIATE_PRESSURE_PSI           1.5F                                        ///< Minimum pressure required to initiate the dry bicart fill process.
 #define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE_PSI    10.0F                                       ///< Maximum pressure allowed at bicart fill during supply process/state
 #define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE_PSI    3.0F                                        ///< Minimum pressure required to initiate the dry bicart fill during supply process/state
@@ -760,7 +760,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_FILL_COMPLETE_PRESSURE_PSI;
 
     // Close dry bicart inlet water if D66 pressure is 17 PSI
     if ( d66Pressure >= fillCompletePressure )
@@ -1023,7 +1023,7 @@
 {
     BICARB_CHAMBER_FILL_EXEC_STATE_T state  = BICARB_CARTRIDGE_FILL_WATER_END_STATE;
     F32 d66Pressure                         = getFilteredPressure( D66_PRES );
-    F32 fillCompletePressure                = GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI;
+    F32 fillCompletePressure                = GET_FILL_COMPLETE_PRESSURE_PSI;
 
     // check D66 pressure greater than or equal to  17 PSI
     if ( d66Pressure >= fillCompletePressure )