Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r3dd12fb9d032f85126db82ca48812a4652a5b75f -r0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 3dd12fb9d032f85126db82ca48812a4652a5b75f)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e)
@@ -256,12 +256,8 @@
             break;
 
         case PRESSURE_TEST_STATE_IN_PROGRESS:
-            baroConvConsts.pressureSensitivity          = getFPGABaroPressureSensitivity();
-            baroConvConsts.pressureSensitivityTempCoeff = getFPGABaroTempCoeffOfPressSensitvity();
-            baroConvConsts.pressureOffset               = getFPGABaroPressureOffset();
-            baroConvConsts.pressureOffsetTempCoeff      = getFPGABaroTempCoeffOfPressOffset();
-            pressuresSelfTestResult                     = handleSelfTestADCCheck();
-            pressuresSelfTestState                      = PRESSURE_TEST_STATE_COMPLETE;
+            pressuresSelfTestResult = handleSelfTestADCCheck();
+            pressuresSelfTestState  = PRESSURE_TEST_STATE_COMPLETE;
 
             break;
 
@@ -343,9 +339,13 @@
                      break;
 
                 case PRESSURE_SENSOR_BAROMETRIC:
-                    pressureBeforeCal           = calculateBaroPressure( (U32)adcSum );
-                    pressures[ sensorId ].data  = getCalibrationAppliedPressure( sensorId, pressureBeforeCal );
-                    msrdPressureSum[ sensorId ] = 0;
+                    baroConvConsts.pressureSensitivity          = getFPGABaroPressureSensitivity();
+                    baroConvConsts.pressureSensitivityTempCoeff = getFPGABaroTempCoeffOfPressSensitvity();
+                    baroConvConsts.pressureOffset               = getFPGABaroPressureOffset();
+                    baroConvConsts.pressureOffsetTempCoeff      = getFPGABaroTempCoeffOfPressOffset();
+                    pressureBeforeCal                           = calculateBaroPressure( (U32)adcSum );
+                    pressures[ sensorId ].data                  = getCalibrationAppliedPressure( sensorId, pressureBeforeCal );
+                    msrdPressureSum[ sensorId ]                 = 0;
                     break;
             }
         }