Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -r6d9f21e96ba7679156c4d6a5873d4b749bb2ce03 -raa97aa9a57c5cd5c2c0bf9a09dd14c6630882772
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 6d9f21e96ba7679156c4d6a5873d4b749bb2ce03)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision aa97aa9a57c5cd5c2c0bf9a09dd14c6630882772)
@@ -890,6 +890,16 @@
     {
 //        switch( param )
 //        {
+//            case TREATMENT_PARAM_TREATMENT_MODALITY:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minTxModality ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HDF_TREATMENT_MODE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
 //            case TREATMENT_PARAM_BLOOD_FLOW:
 //                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
 //                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
@@ -907,36 +917,136 @@
 //                result |= ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_ONE_MINUTE_TREATMENT ) ? TRUE : FALSE );
 //                break;
 //
-//            case TREATMENT_PARAM_SALINE_BOLUS_VOLUME:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//            case TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
 //                break;
 //
-//            case TREATMENT_PARAM_DIALYSATE_TEMPERATURE:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//            case TREATMENT_PARAM_HEPARIN_TYPE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
 //                break;
 //
+//            case TREATMENT_PARAM_DRY_BICARB_CART_SIZE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_SODIUM:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_BICARBONATE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_DIALYZER_TYPE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_FLUID_BOLUS_VOLUME:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                break;
+//
 //            case TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW:
 //                result = ( ( value.sInt >= hdInstitutionalRecord.minArtPressLimitWindowMMHG ) &&
 //                           ( value.sInt <= hdInstitutionalRecord.maxArtPressLimitWindowMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW:
-//                result = ( ( value.sInt >= hdInstitutionalRecord.minVenPressLimitWindowMMHG ) &&
-//                           ( value.sInt <= hdInstitutionalRecord.maxVenPressLimitWindowMMHG ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minVenPressLimitWindowMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxVenPressLimitWindowMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC:
-//                result = ( ( value.sInt >= hdInstitutionalRecord.minVenAsymPressLimitMMHG ) &&
-//                           ( value.sInt <= hdInstitutionalRecord.maxVenAsymPressLimitMMHG ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minVenAsymPressLimitMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxVenAsymPressLimitMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW:
-//                result = ( ( value.sInt >= hdInstitutionalRecord.minTmpPressLimitWindowMMHG ) &&
-//                           ( value.sInt <= hdInstitutionalRecord.maxTmpPressLimitWindowMMHG ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minTmpPressLimitWindowMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxTmpPressLimitWindowMMHG ) ? TRUE : FALSE );
 //                break;
 //
+//            case TREATMENT_PARAM_PRIME_DISCARD_VOLUME:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_RINSEBACK_FLOW_RATE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HEPATITIS_B:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_SYSTOLIC_BP_HIGH_ALARM_LIMIT:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_PRES_ALARM_PERSISTENCE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_SUBST_FLUID_VOLUME:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_HEPARIN_DELIVERY_RATE:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_DIALYSATE_TEMPERATURE:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_ACID_K_PLUS:
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                break;
+//
+//            case TREATMENT_PARAM_ACID_CA2_PLUS:
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                break;
+//
 //            case TREATMENT_PARAM_UF_VOLUME:
 //                result  = ( ( value.sFlt >= hdInstitutionalRecord.minUFVolumeL ) && ( value.sFlt <= hdInstitutionalRecord.maxUFVolumeL ) ? TRUE : FALSE );
 //                result |= ( fabs( value.sFlt ) <= NEARLY_ZERO ? TRUE : FALSE ); // There might be a minimum UF volume set in the institutional record but a treatment with 0 vol should be allowed
@@ -957,11 +1067,6 @@
 //#ifndef _VECTORCAST_
 //                // Right now, all the F32 and S32 data types are covered in the institutional record and therefore, there is no test case that is either F32 or S32
 //                // and gets here so it is removed from VectorCAST to be able to achieve 100% coverage of the function
-//                else if ( CRITICAL_DATA_TYPE_S32 == TREAT_PARAMS_PROPERTIES[ param ].dataType )
-//                {
-//                    result = ( ( value.sInt >= TREAT_PARAMS_PROPERTIES[ param ].min.sInt ) &&
-//                               ( value.sInt <= TREAT_PARAMS_PROPERTIES[ param ].max.sInt ) ? TRUE : FALSE );
-//                }
 //                else
 //                {
 //                    result = ( ( value.sFlt >= TREAT_PARAMS_PROPERTIES[ param ].min.sFlt ) &&