Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -ra12f3ce494cd2a18aee31659c17d8a619fc70f7d -rc2951f468ebc19160ee9af14cc9c35bc16121889
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision a12f3ce494cd2a18aee31659c17d8a619fc70f7d)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision c2951f468ebc19160ee9af14cc9c35bc16121889)
@@ -21,6 +21,7 @@
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "Messaging.h"
+#include "ModeStandby.h"
 #include "ModeTreatment.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
@@ -109,7 +110,7 @@
 /// Treatment parameter properties including data type, range limits and default values.
 static const TREATMENT_PARAMS_PROPERTIES_T TREAT_PARAMS_PROPERTIES[ NUM_OF_TREATMENT_PARAMS ] =
 {   //         type                min           max         default
-    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_TREATMENT_MODALITY
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=3},    {.uInt=0}    }, // TREATMENT_PARAM_TREATMENT_MODALITY
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_HDF_DILUTION
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=500},  {.uInt=50}   }, // TREATMENT_PARAM_BLOOD_FLOW
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=600},  {.uInt=50}   }, // TREATMENT_PARAM_DIALYSATE_FLOW
@@ -573,11 +574,11 @@
 
     switch ( txType )
     {
-        case TREATMENT_MODALITY_HDF:
+        case TREATMENT_MODALITY_HDF_ONLINE_FLUID:
             result = FALSE;
             break;
 
-        case TREATMENT_MODALITY_HD:
+        case TREATMENT_MODALITY_HD_SALINE_FLUID:
             result = ( ( ( param == TREATMENT_PARAM_HDF_DILUTION ) || ( param == TREATMENT_PARAM_SUBST_FLUID_VOLUME ) ) ? TRUE : FALSE );
             break;
 
@@ -730,12 +731,13 @@
  *************************************************************************/
 static BOOL checkTreatmentParamsDependencies( U32 *reasons )
 {
-    BOOL result = TRUE;
-    U32  txDur  = stagedParams[ TREATMENT_PARAM_TREATMENT_DURATION ].uInt;
-    U32  hepST  = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION ].uInt;
-    F32  hepDR  = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ].sFlt;
-    F32  hepBV  = stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt;
-    F32  txVol  = hepBV + ( hepDR * ( hepST / (F32)SEC_PER_MIN ) ) + SYRINGE_PUMP_PRIME_VOLUME_ML + SYRINGE_PUMP_FILL_VOLUME_OFFSET_ML;
+    BOOL result   = TRUE;
+    U32  txDur    = stagedParams[ TREATMENT_PARAM_TREATMENT_DURATION ].uInt;
+    U32  hepST    = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION ].uInt;
+    F32  hepDR    = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ].sFlt;
+    F32  hepBV    = stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt;
+    F32  txVol    = hepBV + ( hepDR * ( hepST / (F32)SEC_PER_MIN ) ) + SYRINGE_PUMP_PRIME_VOLUME_ML + SYRINGE_PUMP_FILL_VOLUME_OFFSET_ML;
+    U32  modality = stagedParams[ TREATMENT_PARAM_TREATMENT_MODALITY ].uInt;
 
     // Variable to validate acid conversion factor consistency
     U32 acidType        = stagedParams[ TREATMENT_PARAM_ACID_CONCENTRATE ].uInt;
@@ -766,6 +768,13 @@
         result = FALSE;
     }
 
+    // Verify Rx entered modality with the treatment initiation modality
+    if ( modality != getModality() )
+    {
+        reasons[ TREATMENT_PARAM_TREATMENT_MODALITY ] = REQUEST_REJECT_REASON_MODALITY_MISMATCH;
+        result = FALSE;
+    }
+
     return result;
 }