Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -ra323cf979a9055accab7963a3402ae3e70edf4b6 -r1107aac8d7e2b66b5f605c046798bca8bca44859
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision a323cf979a9055accab7963a3402ae3e70edf4b6)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 1107aac8d7e2b66b5f605c046798bca8bca44859)
@@ -104,7 +104,7 @@
 static F32  calculateBaroTemperatureC( U32 baroTempCount );
 static void checkBaroSensorCoeffsCRC( void );
 static F32  getCalibrationAppliedPressure( U08 sensorId, F32 pressure );
-static F32 convertPsiToMmhg( F32 psi );
+static F32  convertPsiToMmhg( F32 psi );
 
 /*********************************************************************//**
  * @brief
@@ -524,9 +524,10 @@
 /*********************************************************************//**
  * @brief
  * The convertPsiToMmhg function handles the pressure sensor
- * @details \b Inputs: flags
- * @details \b Outputs: flags handled
- * @return next state
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param sensor ID of pressure sensor
+ * @return the pressure in mmHg
  *************************************************************************/
 static F32 convertPsiToMmhg( F32 psi )
 {
@@ -541,6 +542,7 @@
    {
        // Beta 1.9: 15 PSI
        psiToMmhgConversionFactor = ( PRESSURE_MAX_PSI / 15.0F );
+   }
 
    return ( psi * psiToMmhgConversionFactor );
 }
Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -ra323cf979a9055accab7963a3402ae3e70edf4b6 -r1107aac8d7e2b66b5f605c046798bca8bca44859
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision a323cf979a9055accab7963a3402ae3e70edf4b6)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 1107aac8d7e2b66b5f605c046798bca8bca44859)
@@ -81,13 +81,14 @@
 #define TMP_PRESSURE_LIMIT_WINDOW_DEFAULT_MMHG    ( 200.0F )                                ///< Default TMP pressure limit window (mmHg). Used as Window/2 for min/max limits.
 #define TMP_PRESSURE_LIMIT_MAX_MMHG               ( 500.0F )                                ///< Maximum transmembrane pressure limit (in mmHg)
 #define TMP_PRESSURE_LIMIT_MIN_MMHG               ( -500.0F )                               ///< Minimum transmembrane pressure limit (in mmHg)
-#define TMP_PRESSURE_HIGH_ABSOLUTE_MMHG           ( 500.0F )                                ///< Transmembrance pressure high absolute (in mmHg)
+#define TMP_PRESSURE_HIGH_ABSOLUTE_MMHG           ( 500.0F )                                ///< Transmembrane pressure high absolute (in mmHg)
 #define TMP_ALARM_PERSISTENCE                     ( ( 1 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )   ///< Alarm persistence period for transmembrane pressure alarms
 
 #define MIN_TIME_BETWEEN_AIR_TRAP_FILL_EXEMPTIONS_MS        ( 1200 )                        ///< To monitor low Venous pressure in the defined interval in a case where continuous air fill event happens followed by exemption period to stabilize the pressure
-#define MIN_TIME_BETWEEN_AIR_TRAP_FILL_EXEMPTIONS_WINDOW    ( MIN_TIME_BETWEEN_AIR_TRAP_FILL_EXEMPTIONS_MS / \
-                                                              TASK_GENERAL_INTERVAL )       ///< Low Venous pressure monitoring window between air fill events based on the task interval time
 
+///< Low Venous pressure monitoring window between air fill events based on the task interval time
+#define MIN_TIME_BETWEEN_AIR_TRAP_FILL_EXEMPTIONS_WINDOW    ( MIN_TIME_BETWEEN_AIR_TRAP_FILL_EXEMPTIONS_MS / TASK_GENERAL_INTERVAL )
+
 #define MAX_ART_VEN_OFFSET_MMHG             15.0F                                           ///< Maximum arterial/venous offset allowed.
 
 #define EMPTY_SALINE_BAG_THRESHOLD_MMHG     -300.0F                                         ///< Threshold below which the saline bag is considered empty (in mmHg).
@@ -503,6 +504,10 @@
 {
     if ( PRESSURE_LIMITS_STATE_STABLE == currPresLimitsState )
     {
+        artPressureLimitWindow.data =(F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
+        venPressureLimitWindow.data = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
+        tmpPressureLimitWindow.data = (F32)getTreatmentParameterS32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW );
+
         // apply pressure windows when stable
         S32 artOffset = getTreatmentParameterS32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW ) / 2;
         S32 venMinOffset = getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );