Index: NVDataMgmt.c
===================================================================
diff -u -r20b126271232f1b3c4a7aef9fa6fe1f9e9b019e6 -r1ba84c9eec58aca4e7b5ce35ba249e9434d74ca4
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 20b126271232f1b3c4a7aef9fa6fe1f9e9b019e6)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1ba84c9eec58aca4e7b5ce35ba249e9434d74ca4)
@@ -427,7 +427,7 @@
   {SERVICE_RECORD_START_ADDRESS,        sizeof(DG_SERVICE_GROUP_T),         MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgServiceGroup,       (U08*)&dgServiceGroup.crc,        NVDATAMGMT_RTC},        // NVDATAMGMT_SERVICE_RECORD
   {DG_SCHEDULED_RUNS_START_ADDRESS,     sizeof(DG_SCHEDULED_RUNS_GROUP_T),  MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgScheduledRunsGroup, (U08*)&dgScheduledRunsGroup.crc,  NVDATAMGMT_RTC},        // NVDATAMGMT_SCHEDULER_RECORD
   {DG_HEATERS_INFO_START_ADDRESS,       sizeof(DG_HEATERS_INFO_GROUP_T),    MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgHeatersInfoGroup,   (U08*)&dgHeatersInfoGroup.crc,    NVDATAMGMT_RTC},        // NVDATAMGMT_HEATERS_INFO_RECORD
-  {SW_CONFIGS_START_ADDRESS,            sizeof(SW_CONFIGS_RECORD_T),        MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&swConfigsRecord,        (U08*)&swConfigsRecord.crc,         NVDATAMGMT_RTC}         // NVDATAMGMT_SW_CONFIG_RECORD
+  {SW_CONFIGS_START_ADDRESS,            sizeof(SW_CONFIGS_RECORD_T),        MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&swConfigsRecord,      (U08*)&swConfigsRecord.crc,       NVDATAMGMT_RTC}         // NVDATAMGMT_SW_CONFIG_RECORD
 };
 #endif
 
@@ -438,9 +438,10 @@
 static HD_USAGE_INFO_GROUP_T        hdUsageInfoGroup;                                                           ///< HD usage info group structure (including padding and final CRC).
 // Process records specifications
 const PROCESS_RECORD_SPECS_T RECORDS_SPECS [ NUM_OF_NVDATMGMT_RECORDS_JOBS ] =  {
-    {CAL_RECORD_NV_MEM_START_ADDRESS,       sizeof(HD_CALIBRATION_RECORD_T),    MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_CALIBRATION_RECORD_T), (U08*)&hdCalibrationRecord,   (U08*)&hdCalibrationRecord.crc},           // NVDATAMGMT_CALIBRATION_RECORD
-    {SYSTEM_RECORD_NV_MEM_START_ADDRESS,    sizeof(HD_SYSTEM_GROUP_T),          MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SYSTEM_GROUP_T),       (U08*)&hdSystemGroup,         (U08*)&hdSystemGroup.crc},                 // NVDATAMGMT_SYSTEM_RECORD
-    {SERVICE_RECORD_START_ADDRESS,          sizeof(HD_SERVICE_GROUP_T),         MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdServiceGroup,        (U08*)&hdServiceGroup.crc},                // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
+  {CAL_RECORD_NV_MEM_START_ADDRESS,    sizeof(HD_CALIBRATION_RECORD_T), MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_CALIBRATION_RECORD_T), (U08*)&hdCalibrationRecord, (U08*)&hdCalibrationRecord.crc, NVDATAMGMT_EEPROM},            // NVDATAMGMT_CALIBRATION_RECORD
+  {SYSTEM_RECORD_NV_MEM_START_ADDRESS, sizeof(HD_SYSTEM_GROUP_T),       MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SYSTEM_GROUP_T),       (U08*)&hdSystemGroup,       (U08*)&hdSystemGroup.crc,       NVDATAMGMT_EEPROM},            // NVDATAMGMT_SYSTEM_RECORD
+  {SERVICE_RECORD_START_ADDRESS,       sizeof(HD_SERVICE_GROUP_T),      MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdServiceGroup,      (U08*)&hdServiceGroup.crc,      NVDATAMGMT_RTC},               // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
+  {SW_CONFIGS_START_ADDRESS,           sizeof(SW_CONFIGS_RECORD_T),     MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&swConfigsRecord,     (U08*)&swConfigsRecord.crc,     NVDATAMGMT_RTC}                // NVDATAMGMT_SW_CONFIG_RECORD
 };
 #endif
 
@@ -2145,39 +2146,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSelfTestReadSWConfigRecord reads the software configurations
- * record from RTC RAM.
- * @details Inputs: none
- * @details Outputs: none
- * @return next state
- *************************************************************************/
-static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadSWConfigRecord( void )
-{
-    NVDATAMGMT_SELF_TEST_STATE_T state = NVDATAMGMT_SELF_TEST_STATE_READ_SW_CONFIG_RECORD;
-    BOOL timeoutStatus = didCommandTimeout( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
-
-#ifndef _RELEASE_
-    if ( ( RTC_RAM_STATUS_IDLE == getRTCRAMStatus() ) || ( TRUE == timeoutStatus ) )
-    {
-        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SW_CONFIG_RECORD ];
-        U08* bufferAddress  = specs.structAddressPtr;
-        U32 maxBufferLength = specs.maxReadBufferSize;
-
-        getDataFromRAM( bufferAddress, maxBufferLength );
-
-        state = NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC;
-    }
-#else
-    // It is a release so set all the software configurations to 0 to be considered as disable
-    memset( specs.structAddressPtr, 0, specs.sizeofJob );
-    state = NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC;
-#endif
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSelfTestReadDGWaterConsumption reads the DG water consumption
  * from RTC RAM.
  * @details Inputs: currentTime, waterConsumptionRecord
@@ -2238,6 +2206,39 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSelfTestReadSWConfigRecord reads the software configurations
+ * record from RTC RAM.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return next state
+ *************************************************************************/
+static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadSWConfigRecord( void )
+{
+    NVDATAMGMT_SELF_TEST_STATE_T state = NVDATAMGMT_SELF_TEST_STATE_READ_SW_CONFIG_RECORD;
+    BOOL timeoutStatus = didCommandTimeout( ALARM_ID_RTC_RAM_OPS_ERROR, (U08*)&state );
+
+#ifndef _RELEASE_
+    if ( ( RTC_RAM_STATUS_IDLE == getRTCRAMStatus() ) || ( TRUE == timeoutStatus ) )
+    {
+        PROCESS_RECORD_SPECS_T specs = RECORDS_SPECS[ NVDATAMGMT_SW_CONFIG_RECORD ];
+        U08* bufferAddress  = specs.structAddressPtr;
+        U32 maxBufferLength = specs.maxReadBufferSize;
+
+        getDataFromRAM( bufferAddress, maxBufferLength );
+
+        state = NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC;
+    }
+#else
+    // It is a release so set all the software configurations to 0 to be considered as disable
+    memset( specs.structAddressPtr, 0, specs.sizeofJob );
+    state = NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC;
+#endif
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleSelfTestCheckCRC calculates the CRC of the records and compares
  * them to the CRC that was read. If they don't match, it will fail POST.
  * @details Inputs: nvDataMgmtSelfTestResult