Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3 -rdf0a0b9ce1414b00b381e516714f9089d8e4ae21
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision df0a0b9ce1414b00b381e516714f9089d8e4ae21)
@@ -118,15 +118,15 @@
     initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_FAULT, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
 
     // TODO remove, temporary code
-    for ( i = 0; i < NUM_OF_CAL_DATA_PRES_SENSORS; i++ )
+    /*for ( i = 0; i < NUM_OF_CAL_DATA_PRES_SENSORS; i++ )
     {
         pressuresCalRecord.pressureSensors[ i ].fourthOrderCoeff = 0.0;
         pressuresCalRecord.pressureSensors[ i ].thirdOrderCoeff  = 0.0;
         pressuresCalRecord.pressureSensors[ i ].secondOrderCoeff = 0.0;
         pressuresCalRecord.pressureSensors[ i ].gain             = 1.0;
         pressuresCalRecord.pressureSensors[ i ].offset           = 0.0;
-    }
-    // TODO remove, temporary code
+    }*/
+    // TODO remove, temporary code
 }
 
 /*********************************************************************//**
@@ -227,7 +227,8 @@
 
 /*********************************************************************//**
  * @brief
- * The execPressureSelfTest function executes the pressures self-test's state machine.
+ * The execPressureSelfTest function executes the pressures self-test's
+ * state machine.
  * @details Inputs: pressuresSelfTestState
  * @details Outputs: pressuresSelfTestState
  * @return PressuresSelfTestResult (SELF_TEST_STATUS_T)
@@ -237,6 +238,7 @@
     switch ( pressuresSelfTestState )
     {
         case PRESSURE_SELF_TEST_STATE_START:
+            processCalibrationData();
             pressuresSelfTestState = PRESSURE_TEST_STATE_IN_PROGRESS;
             pressuresSelfTestResult = SELF_TEST_STATUS_IN_PROGRESS;
             break;
@@ -373,7 +375,7 @@
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.
  * @details Inputs: none
- * @details Outputs: loadCellsCalRecord
+ * @details Outputs: pressuresCalRecord
  * @return TRUE if the calibration record is valid, otherwise FALSE
  *************************************************************************/
 static BOOL processCalibrationData( void )
@@ -396,15 +398,13 @@
 #endif
             status = FALSE;
         }
-        else
-        {
-            // The calibration data was valid, update the local copy
-            pressuresCalRecord.pressureSensors[ sensor ].fourthOrderCoeff = calData.pressureSensors[ sensor ].fourthOrderCoeff;
-            pressuresCalRecord.pressureSensors[ sensor ].thirdOrderCoeff  = calData.pressureSensors[ sensor ].thirdOrderCoeff;
-            pressuresCalRecord.pressureSensors[ sensor ].secondOrderCoeff = calData.pressureSensors[ sensor ].secondOrderCoeff;
-            pressuresCalRecord.pressureSensors[ sensor ].gain             = calData.pressureSensors[ sensor ].gain;
-            pressuresCalRecord.pressureSensors[ sensor ].offset           = calData.pressureSensors[ sensor ].offset;
-        }
+
+        // The calibration data was valid, update the local copy
+        pressuresCalRecord.pressureSensors[ sensor ].fourthOrderCoeff = calData.pressureSensors[ sensor ].fourthOrderCoeff;
+        pressuresCalRecord.pressureSensors[ sensor ].thirdOrderCoeff  = calData.pressureSensors[ sensor ].thirdOrderCoeff;
+        pressuresCalRecord.pressureSensors[ sensor ].secondOrderCoeff = calData.pressureSensors[ sensor ].secondOrderCoeff;
+        pressuresCalRecord.pressureSensors[ sensor ].gain             = calData.pressureSensors[ sensor ].gain;
+        pressuresCalRecord.pressureSensors[ sensor ].offset           = calData.pressureSensors[ sensor ].offset;
     }
 
     return status;