Index: sources/drydemo/StateController.h
===================================================================
diff -u -rb13dd2b30889640ebf03f54414f536ca5c8d2dc7 -rbf271a558491a83b39eb30748784f1b744736dd2
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision b13dd2b30889640ebf03f54414f536ca5c8d2dc7)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision bf271a558491a83b39eb30748784f1b744736dd2)
@@ -35,7 +35,7 @@
         User_Command_ID userCmd;
         QString         stateTransitionEvent;
         bool            requestTreatmentReset;
-        // Blood pump
+        // Blood pump variables
         bool            isBloodPumpRunning;
         // Treatment time variable(s)
         quint32         treatmentElapsedTimeMS;
@@ -72,13 +72,25 @@
         bool            hasResumeTxBeenRequested;
         bool            hasRecircWarnAlarmBeenTrig;
         bool            hasRecircTimeoutAlarmBeenTrig;
-        // Vitals alarm limits
-        quint32 systolicBPLowAlarmLimit;
-        quint32 systolicBPHighAlarmLimit;
-        quint32 heartRateLowAlarmLimit;
-        quint32 heartRateHighAlarmLimit;
+        // Vitals alarm limits variables (not used right now)
+        quint32         systolicBPLowAlarmLimit;
+        quint32         systolicBPHighAlarmLimit;
+        quint32         heartRateLowAlarmLimit;
+        quint32         heartRateHighAlarmLimit;
+        // Dry bicart update variables
+        Dry_Bicart_Action bicartAction;
+        quint32         bicartShowDialog;
+        quint32         bicartTotal;
+        float           bicartProgress;
+        quint32         bicartDrainInProgress;
+        quint32         bicartDepresInProgress;
     };
 
+    struct HDF_vars {
+        float           hdfManualRateMLPM;
+        float           hdfCurrentVolumeML;
+    };
+
     struct Pressure_Vars {
         Pressure_Limits_States         presLimitState;
         Pressure_Stabilization_Periods presStabilizeTimePeriod;
@@ -92,6 +104,7 @@
         qint32   arterialMaxLimitMMHG;
         float    arterialFilteredMMHG;
         qint32   arterialStableMMHG;
+        qint32   arterialPresLimitWindowMMHG;
         // Venous
         float    venousRawMMHG[SHORT_MOVING_AVG_SIZE];
         quint32  venousIndex;
@@ -100,6 +113,8 @@
         qint32   venousMaxLimitMMHG;
         float    venousFilteredMMHG;
         qint32   venousStableMMHG;
+        qint32   venousPresLowLimitWindowMMHG;
+        qint32   venousPresHighLimitWindowMMHG;
         // TMP
         float    tmpRawMMHG[SHORT_MOVING_AVG_SIZE];
         quint32  tmpIndex;
@@ -108,6 +123,7 @@
         float    tmpMaxLimitMMHG;
         float    tmpFilteredMMHG;
         qint32   tmpStableMMHG;
+        qint32   tmpPresLimitWindowMMHG;
     };
 
     struct Treatment_Sub_State_Vars {
@@ -198,8 +214,11 @@
     bool hasUIConfirmMessageTimedout(const Generic_Confirm_Id confirmID);
     void handleSendUIConfirmationMessage(const Generic_Confirm_Id confirmID, const Generic_Confirm_Command confirmCmd, const Reject_Reasons rejectReason = REQUEST_REJECT_REASON_NONE);
 
+    // Pre-treatment methods
+    void handleSetupTubingSetConnectionsRequestMessage();
+
     // Blood prime methods
-    float getBloodPrimeRampStepML();
+    float handleBloodPrimeGetRampStepML();
     void handleBloodPrimePauseResume(bool &resume);
     void handleBloodPrimeBroadcastData(const float accumulatedVolML, const quint32 primeTimeOutS, const quint32 pauseCountDownS, const Broadcast_Type BCType);
     void handleBloodPrimeVolML(const bool resume, const float rampStepML, const bool hasFlowChanged, quint32 &currBloodFlowMLPM, float &accumBloodVolML);
@@ -233,11 +252,20 @@
     void handleDeterminePressureLimits();
     void handleSignalInitiatePressureStabilization(const Pressure_Stabilization_Periods period);
     void handleWidenPressureLimitsMessage();
-    // Treatment vitals
+    void handlePressureLimitsChangeRequest();
+    // Treatment vitals methods
     void handleVitalsAdjustmentMessage();
     void handleVitalsBroadcastData();
     void handleVitalsDataRquest();
 
+    // HDF Treatment methods
+    void handleTreatmentHDF();
+    void handleHemodialfiltrationBroadcastData(const Broadcast_Type BCType);
+
+    // Treatment pause methods
+    void handleDryBicartBroadcastData(const Broadcast_Type BCType);
+    void handleDryBicartActionRequest();
+
     // Treatment rinseback methods
     void initializeRinseback();
     void handleRinsebackRequestMessage();