Index: sources/drydemo/StateController.cpp
===================================================================
diff -u -rb13dd2b30889640ebf03f54414f536ca5c8d2dc7 -rbf271a558491a83b39eb30748784f1b744736dd2
--- sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision b13dd2b30889640ebf03f54414f536ca5c8d2dc7)
+++ sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision bf271a558491a83b39eb30748784f1b744736dd2)
@@ -44,6 +44,7 @@
     _alarmTriggerSpecs[ALARM_ID_TD_TREATMENT_STOPPED_BY_USER           ] = {ALARM_PRIORITY_HIGH   , ALARM_STOP_TX_PROPERTIES         , ALARM_TRANS_TO_TX_PAUSE    };
     _alarmTriggerSpecs[ALARM_ID_TD_RECIRC_TIMEOUT_WARNING              ] = {ALARM_PRIORITY_LOW    , ALARM_RECIRC_WARN_PROPERTIES     , ALARM_NOT_TRANS_TO_TX_PAUSE};
     _alarmTriggerSpecs[ALARM_ID_TD_RECIRC_TIMEOUT                      ] = {ALARM_PRIORITY_HIGH   , ALARM_RECIR_TIMEOUT_RPOPERTIES   , ALARM_NOT_TRANS_TO_TX_PAUSE};
+    _alarmTriggerSpecs[ALARM_ID_TD_TREATMENT_MODALITY_CHANGE           ] = {ALARM_PRIORITY_MEDIUM , ALARM_TX_MOD_CHNG_PROPERTIES     , ALARM_TRANS_TO_TX_PAUSE    };
     _alarmTriggerSpecs[ALARM_ID_DD_REPLACE_ACID_CONCENTRATE            ] = {ALARM_PRIORITY_MEDIUM , ALARM_REPLACE_ACID_PROPERTIES    , ALARM_TRANS_TO_TX_PAUSE    };
     _alarmTriggerSpecs[ALARM_ID_DD_REPLACE_BICARB_CARTRIDGE            ] = {ALARM_PRIORITY_MEDIUM , ALARM_REPLACE_BICARB_PROPERTIES  , ALARM_TRANS_TO_TX_PAUSE    };
     _alarmTriggerSpecs[ALARM_ID_TD_DIALYSATE_PROPORTIONING_IN_PROGRESS ] = {ALARM_PRIORITY_MEDIUM , ALARM_DIAL_PROPOR_PROPERTIES     , ALARM_TRANS_TO_TX_PAUSE    };
@@ -82,7 +83,9 @@
         case ID_UI_ALARM_USER_ACTION_REQUEST:
         case ID_UI_RINSEBACK_CMD_RQST:
         case ID_UI_RECIRCULATE_RQST:
-    case ID_UI_VITALS_ADJUSTMENT_RQST:
+        case ID_UI_VITALS_ADJUSTMENT_RQST:
+        case ID_UI_PRESSURE_LIMITS_CHANGE_RQST:
+        case ID_UI_DRY_BICART_DISCONNECT_RQST:
             _treatmentRcvdMessages[receivedMsgID] = msg[RCVD_MSG_PAYLOAD_INDEX];
             break;
 
@@ -97,6 +100,7 @@
         case ID_UI_ADJUST_START_TREATMENT_RQST:
         case ID_UI_PRESSURE_LIMIT_WIDEN_RQST:
         case ID_UI_BLOOD_PRESSURE_RQST:
+        case ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RQST:
             _treatmentRcvdMessages[receivedMsgID] = 0;
                 break;
 
@@ -140,6 +144,11 @@
         case ID_TD_RECIRCULATE_DATA:
         case ID_ACK_MESSAGE_THAT_REQUIRES_ACK:
         case ID_TD_VITALS_ADJUSTMENT_RESP:
+        case ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESP:
+        case ID_TD_HEMODIAFILTRATION_DATA:
+        case ID_TD_PRESSURE_LIMITS_CHANGE_RESP:
+        case ID_TD_DRY_BICART_DISCONNECT_DATA:
+        case ID_TD_DRY_BICART_DISCONNECT_RESP:
             // Do nothing
             break;
     }
@@ -236,6 +245,8 @@
         handleBackToStandbyEvent(status);
         handleInitiateTreatmentRequestMessage(status);
 
+        handleSetupTubingSetConnectionsRequestMessage();
+
         if (! _treatmentRcvdMessages[ID_UI_ADJUST_DISPOSABLES_CONFIRM_RQST].isNull()){
             _treatmentRcvdMessages[ID_UI_ADJUST_DISPOSABLES_CONFIRM_RQST].clear();
             handleUIResponseMessage(ID_TD_ADJUST_DISPOSSABLES_CONFIRM_RESP, ACCEPT_VALUE);
@@ -288,7 +299,7 @@
         _treatmentSubStates.bloodPrimeState = BLOOD_PRIME_RAMP_STATE;
         _treatmentSubStates.txState         = TREAT_BLOOD_PRIME_STATE;
         handleTreatmentStatesBroadcastData(BC_IMMEDIATELY);
-        rampStepML = getBloodPrimeRampStepML();
+        rampStepML = handleBloodPrimeGetRampStepML();
         status     = STATE_ON_ACTION;
         qDebug() << "Blood prime on entry";
     };
@@ -373,11 +384,11 @@
         handleBackToStandbyEvent(status);
         handleTDOpModeTransitionBroadcastData(MODE_TREA, 0, BC_DELAYED);
         handleTreatmentStatesBroadcastData(BC_DELAYED);
-        // Fluid bolus functions
+        // Fluid bolus methods
         handleFluidBolusRequestMessage();
         handleFluidBolusFluidDelivery(_treatmentParams.bloodFlowRateMLPM);
         handleFluidBolusBroadcastData(BC_DELAYED);
-        // Broadcast functions
+        // Broadcast methods
         handleTreatmentTimeProcessAndBroadcastData(BC_DELAYED);
         handleTreatmentPrescriptionEditRequestMessage();
         handleSetPointBloodFlowChange(_treatmentParams.bloodFlowRateMLPM, hasFlowChngeRequested);
@@ -387,26 +398,30 @@
         handleDDConductivityBroadcastData(BC_DELAYED);
         handleSetPointDialysateFlowChange();
         handleSetPointDialysateTemperatureChange();
-        // Pressure functions
+        // Pressure methods
         handlePressureLimitState();
         handleTDPressureBroadcastData(BC_DELAYED);
         handleDeterminePressureLimits();
         handleWidenPressureLimitsMessage();
-        // UF functions functions
+        handlePressureLimitsChangeRequest();
+        // UF functions methods
         handleUltrafiltrationPauseResume();
         handleUltrafiltrationVolumeChangeValidation();
         handleUltrafiltrationVolumeChangeConfirm();
         handleUltrafiltrationBroadcastData(BC_DELAYED);
-        // Tx Time setting functions
+        // Tx Time setting methods
         handleTreatmentSettingBroadcastData(BC_DELAYED);
         handleTreatmentTimeChangeValidation();
         handleTreatmentTimeChangeConfirm();
         // Alarm methods
         handleChemsReplacementAlarmsSequence(status);
         handleTriggeredAlarmsToTxPause(status);
-        // Vitals functions
+        // Vitals methods
         handleVitalsAdjustmentMessage();
         handleVitalsDataRquest();
+        // HDF methods
+        handleTreatmentHDF();
+        handleHemodialfiltrationBroadcastData(BC_DELAYED);
         // Treatment complete condition
         if ((_treatmentStatus.treatmentElapsedTimeMS / MILLISECONDS_PER_SECOND) >
             (_treatmentParams.treatmentDurationMin * SECONDS_PER_MINUTE)) {