Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -r11a668a2f4a0401eed544be570d9102d143b6f00 -r7f293531061fed9439f4e87e521f3f31eef995be
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 11a668a2f4a0401eed544be570d9102d143b6f00)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 7f293531061fed9439f4e87e521f3f31eef995be)
@@ -211,6 +211,11 @@
     origTreatmentParams.venousPressureLimitWindow_mmHg = 0;
     origTreatmentParams.venousPressureLimitAsymmetric_mmHg = 0;
     origTreatmentParams.tmpLimitWindow_mmHg = 0;
+    origTreatmentParams.systolicBPLowAlarmLimit_mmHg = 0;
+    origTreatmentParams.systolicBPHighAlarmLimit_mmHg = 0;
+    origTreatmentParams.heartRateLowAlarmLimit_BPM = 0;
+    origTreatmentParams.heartRateHighAlarmLimit_BPM = 0;
+    origTreatmentParams.pressureAlarmPersistence_sec = 0;
     origTreatmentParams.uFVolume_L = 0.0F;
 }
 
@@ -901,8 +906,8 @@
 //                break;
 //
 //            case TREATMENT_PARAM_HDF_TREATMENT_MODE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minHDFTxMode ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxHDFTxMode ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_BLOOD_FLOW:
@@ -923,43 +928,38 @@
 //                break;
 //
 //            case TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minHepDeliveryDurationMIN ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxHepDeliveryDurationMIN ) ? TRUE : FALSE );
 //                break;
 //
-//            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 );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minDryBicarbSize ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxDryBicarbSize ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_SODIUM:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSodium ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSodium ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_BICARBONATE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minBicarbonate ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxBicarbonate ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_DIALYZER_TYPE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minDialyzerType ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxDialyzerType ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_FLUID_BOLUS_VOLUME:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minBloodFlowMLPM ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxBloodFlowMLPM ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minFluidBolusVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxFluidBolusVolumeML ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW:
-//                result = ( ( value.sInt >= hdInstitutionalRecord.minArtPressLimitWindowMMHG ) &&
-//                           ( value.sInt <= hdInstitutionalRecord.maxArtPressLimitWindowMMHG ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minArtPressLimitWindowMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxArtPressLimitWindowMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW:
@@ -978,63 +978,63 @@
 //                break;
 //
 //            case TREATMENT_PARAM_PRIME_DISCARD_VOLUME:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minPrimeDiscardVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxPrimeDiscardVolumeML ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minPrimeRinsebackVolumeML ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxPrimeRinsebackVolumeML ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_RINSEBACK_FLOW_RATE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minRinsebackFlowMLPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxRinsebackFlowMLPM ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_HEPATITIS_B:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minHepatitisBStatus ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxHepatitisBStatus ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSystolicBPLowMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSystolicBPLowMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_SYSTOLIC_BP_HIGH_ALARM_LIMIT:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minSystolicBPHighMMHG ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxSystolicBPHighMMHG ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minHearRateLowBPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxHearRateLowBPM ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minHearRateHighBPM ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxHearRateHighBPM ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_PRES_ALARM_PERSISTENCE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.uInt >= hdInstitutionalRecord.minPresPersistenceSEC ) &&
+//                           ( value.uInt <= hdInstitutionalRecord.maxPresPersistenceSEC ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_SUBST_FLUID_VOLUME:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minSubstFluidL ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxSubstFluidL ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minHepBolusVolumeML ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxHepBolusVolumeML ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_HEPARIN_DELIVERY_RATE:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minHepDeliveryRateMLHR ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxHepDeliveryRateMLHR ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_DIALYSATE_TEMPERATURE:
@@ -1043,13 +1043,13 @@
 //                break;
 //
 //            case TREATMENT_PARAM_ACID_K_PLUS:
-//                result = ( ( value.uInt >= hdInstitutionalRecord.minSalineBolusVolumeML ) &&
-//                           ( value.uInt <= hdInstitutionalRecord.maxSalineBolusVolumeML ) ? TRUE : FALSE );
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minAcidKMEQL ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxAcidKMEQL ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_ACID_CA2_PLUS:
-//                result = ( ( value.sFlt >= hdInstitutionalRecord.minDialysateTempC ) &&
-//                           ( value.sFlt <= hdInstitutionalRecord.maxDialysateTempC ) ? TRUE : FALSE );
+//                result = ( ( value.sFlt >= hdInstitutionalRecord.minAcidCa2MEQL ) &&
+//                           ( value.sFlt <= hdInstitutionalRecord.maxAcidCa2MEQL ) ? TRUE : FALSE );
 //                break;
 //
 //            case TREATMENT_PARAM_UF_VOLUME: