Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision d5c94536929ded738e5c8d139d8c46b1d3e035ef)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84)
@@ -33,7 +33,7 @@
 
 // ********** public definitions **********
 
-//#pragma pack(push, 1)
+#pragma pack(push, 1)
 /// dry bicart data structure
 typedef struct
 {
@@ -56,16 +56,18 @@
     PI_CONTROLLER_SIGNALS_DATA dryBiCartBicarbDosingControl;            ///< Dry bicart bicarb dosing closed loop control signals data
     PI_CONTROLLER_SIGNALS_DATA dryBiCartAcidDosingControl;              ///< Dry bicart acid dosing closed loop control signals data
 
-    F32 dryBiCartAcidDoseVolume;                                        ///< Dry bicart acid dose volume
-    F32 dryBiCartBicarbDoseVolume;                                      ///< Dry bicart bicarb dose volume
+    F32 dryBiCartAcidMixVolume;                                        ///< Dry bicart acid dose volume
+    F32 dryBiCartBicarbMixVolume;                                      ///< Dry bicart bicarb dose volume
 
     F32 dryBiCartBicarbDosingKPgain;                                    ///< Dry bicart bicarb dosing control kp gain
     F32 dryBiCartBicarbDosingKIgain;                                    ///< Dry bicart bicarb dosing control ki gain
-    //F32 dryBiCartAcidDosingKPgain;                                      ///< Dry bicart acid dosing control kp gain
-    //F32 dryBiCartAcidDosingKIgain;                                      ///< Dry bicart acid dosing control ki gain
+
+    F32 dryBiCartAcidDosingKPgain;                                      ///< Dry bicart acid dosing control kp gain
+    F32 dryBiCartAcidDosingKIgain;                                      ///< Dry bicart acid dosing control ki gain
+
  } DRY_BICART_DATA_T;
 
-//#pragma pack(pop)
+#pragma pack(pop)
 
 // ********** public function prototypes **********
 
@@ -79,26 +81,15 @@
 BOOL setBicartFillRequested( void );
 BOOL setBicartDrainRequested( void );
 
-F32 getAcidBicarbTargetConductivity( void );
-F32 getAcidBicarbDeltaConductivity( void );
+F32 getDialysateTargetConductivity( void );
+F32 getDialysateDeltaConductivity( void );
 
 F32 getBicarbTargetConductivity( void );
 F32 getBicarbDeltaConductivity( void );
 
-//void setBicarb( F32 targetValue );
-//F32 getBicarb( void );
-void setBicarbDoseVol( F32 targetValue );
-F32 getBicarbDoseVol( void );
+F32 getBicarbMixVol( void );
+F32 getAcidMixVol( void );
 
-F32 getAcidDoseVol( void );
-void setAcidDoseVol( F32 targetValue );
-
-F32 getBicarbKpGainCoefficient( void );
-F32 getBicarbKiGainCoefficient( void );
-
-F32 getAcidKpGainCoefficient( void );
-F32 getAcidKiGainCoefficient( void );
-
 DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void );
  
 BOOL testDryBiCartDataPublishIntervalOverride( MESSAGE_T *message );
@@ -111,18 +102,22 @@
 BOOL testDryBiCartAcidDoseVolumeOverride( MESSAGE_T *message );
 BOOL testDryBiCartBicarbDoseVolumeOverride( MESSAGE_T *message );
 
-BOOL testDryBiCartBicarbDoseVolControlKpGainOverride( MESSAGE_T *message );
-BOOL testDryBiCartBicarbDoseVolControlKiGainOverride( MESSAGE_T *message );
+BOOL testDryBiCartBicarbMixVolControlKpGainOverride( MESSAGE_T *message );
+BOOL testDryBiCartBicarbMixVolControlKiGainOverride( MESSAGE_T *message );
 
-BOOL testDryBiCartAcidDoseVolControlKpGainOverride( MESSAGE_T *message );
-BOOL testDryBiCartAcidDoseVolControlKiGainOverride( MESSAGE_T *message );
+BOOL testDryBiCartAcidMixVolControlKpGainOverride( MESSAGE_T *message );
+BOOL testDryBiCartAcidMixVolControlKiGainOverride( MESSAGE_T *message );
 
 BOOL testDryBiCartTargetConductivityOverride( MESSAGE_T *message );
 BOOL testDryBiCartDeltaConductivityOverride( MESSAGE_T *message );
 
 BOOL testDryBiCartAcidBicarbDeltaConductivityOverride( MESSAGE_T *message );
 BOOL testDryBiCartAcidBicarbTargetConductivityOverride( MESSAGE_T *message );
 
+
+BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message );
+BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif