Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r854f6cd4152f99523debe37d3e7691d08141280a
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 854f6cd4152f99523debe37d3e7691d08141280a)
@@ -1315,97 +1315,50 @@
 BOOL verifyPressureLimitsChange( PRESSURE_LIMIT_CHANGE_REQUEST_T *data )
 {
     BOOL result = TRUE;
-    CRITICAL_DATAS_T proposedNewArtLowLimit, proposedNewArtHighLimit;
-    CRITICAL_DATAS_T proposedNewVenLowLimit, proposedNewVenHighLimit;
-    PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord = { FALSE, 0, 0, 0, 0, 0 };
+    CRITICAL_DATAS_T proposedNewArtLimitWindow;
+    CRITICAL_DATAS_T proposedNewVenLimitWindow;
+    PRESSURE_LIMIT_CHANGE_RESPONSE_T respRecord = { FALSE, 0, 0, 0 };
 
-    proposedNewArtLowLimit.sInt = data->artLowLimit;
-    proposedNewArtHighLimit.sInt = data->artHighLimit;
-    proposedNewVenLowLimit.sInt = data->venLowLimit;
-    proposedNewVenHighLimit.sInt = data->venHighLimit;
+    proposedNewArtLimitWindow.sInt = data->artPresLimitWindowmmHg;
+    proposedNewVenLimitWindow.sInt = data->venPresLimitWindowmmHg;
 
     // Check ranges for changed limits
-    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT, proposedNewArtLowLimit ) )
+    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, proposedNewArtLimitWindow ) )
     {
         respRecord.rejReasonCode = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         result = FALSE;
     }
-    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT, proposedNewArtHighLimit ) )
+    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, proposedNewVenLimitWindow ) )
     {
         respRecord.rejReasonCode = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         result = FALSE;
     }
-    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT, proposedNewVenLowLimit ) )
-    {
-        respRecord.rejReasonCode = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
-        result = FALSE;
-    }
-    if ( FALSE == isTreatmentParamInRange( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT, proposedNewVenHighLimit ) )
-    {
-        respRecord.rejReasonCode = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
-        result = FALSE;
-    }
 
-    // If ranges ok, check separation between low/high limits
-    if ( TRUE == result )
-    {
-        S32  arterialPresLimitDelta = data->artHighLimit - data->artLowLimit;
-        S32  venousPresLimitDelta = data->venHighLimit - data->venLowLimit;
-
-        // Check arterial alarm limits dependency
-        if ( arterialPresLimitDelta < MIN_PRESSURE_ALARM_LIMIT_DELTA_MMHG )
-        {
-            respRecord.rejReasonCode = REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH;
-            result = FALSE;
-        }
-
-        // Check venous alarm limits dependency
-        if ( venousPresLimitDelta < MIN_PRESSURE_ALARM_LIMIT_DELTA_MMHG )
-        {
-            respRecord.rejReasonCode = REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH;
-            result = FALSE;
-        }
-    }
-
     // Set overall result - are changes accepted?
     respRecord.accepted = result;
 
     // If changes accepted, set new pressure limits
     if ( TRUE == result )
     {
-        S32 const artLowLimit = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
-        S32 const artHighLimit = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
-        S32 const venLowLimit = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
-        S32 const venHighLimit = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+        S32 artLimitWindow = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
+        S32 venLimitWindow = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
 
-        setTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT, data->artLowLimit );
-        setTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT, data->artHighLimit );
-        setTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT, data->venLowLimit );
-        setTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT, data->venHighLimit );
+        setTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, data->artPresLimitWindowmmHg );
+        setTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, data->venPresLimitWindowmmHg );
 
-        if ( abs( artLowLimit - data->artLowLimit ) > 0 )
+        if ( abs( artLimitWindow - data->artPresLimitWindowmmHg ) > 0 )
         {
-            sendTreatmentLogEventData( ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, (F32)artLowLimit, (F32)data->artLowLimit );
+            sendTreatmentLogEventData( ARTERIAL_PRESSURE_LIMIT_WINDOW_CHANGE_EVENT, (F32)artLimitWindow, (F32)data->artPresLimitWindowmmHg );
         }
-        if ( abs( artHighLimit - data->artHighLimit ) > 0 )
+        if ( abs( venLimitWindow - data->venPresLimitWindowmmHg ) > 0 )
         {
-            sendTreatmentLogEventData( ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, (F32)artHighLimit, (F32)data->artHighLimit );
+            sendTreatmentLogEventData( VENOUS_PRESSURE_LIMIT_WINDOW_CHANGE_EVENT, (F32)venLimitWindow, (F32)data->venPresLimitWindowmmHg );
         }
-        if ( abs( venLowLimit - data->venLowLimit ) > 0 )
-        {
-            sendTreatmentLogEventData( VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, (F32)venLowLimit, (F32)data->venLowLimit );
-        }
-        if ( abs( venHighLimit - data->venHighLimit ) > 0 )
-        {
-            sendTreatmentLogEventData( VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, (F32)venHighLimit, (F32)data->venHighLimit );
-        }
     }
 
     // Read back limits for transmit to UI.
-    respRecord.artLowLimit = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
-    respRecord.artHighLimit = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
-    respRecord.venLowLimit = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
-    respRecord.venHighLimit = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+    respRecord.artPresLimitWindowmmHg = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
+    respRecord.venPresLimitWindowmmHg = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
     // Send response
     sendPressureLimitsChangeResponse( &respRecord );