Index: NVDataMgmt.c
===================================================================
diff -u -rddbccb1cfb91040d3c740b45d459e51819352b74 -reb638340e4909e12164e37259bc3f154e1a8d823
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision ddbccb1cfb91040d3c740b45d459e51819352b74)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision eb638340e4909e12164e37259bc3f154e1a8d823)
@@ -442,7 +442,7 @@
   {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
+  // TODO unocomment{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
 
@@ -540,12 +540,12 @@
 // Record check helper functions
 static BOOL areRecordsValid( void );
 static BOOL isPolynomialRecordValid( POLYNOMIAL_CAL_PAYLOAD_T* record );
-static BOOL isSWConfigRecordValid( void );
 
 #ifdef _DG_
 static BOOL isDGSystemRecordValid( void );
 static BOOL isDGServiceRecordValid( void );
 static BOOL isDGCalibrationRecordValid( void );
+static BOOL isSWConfigRecordValid( void );
 static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record );
 static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record );
 static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record );
@@ -2275,15 +2275,14 @@
     haveCalGroupsPassed    = isDGCalibrationRecordValid();
     hasSystemRecordPassed  = isDGSystemRecordValid();
     hasServiceRecordPassed = isDGServiceRecordValid();
+    hasSWConfigRecordPassed = isSWConfigRecordValid();
 #endif
 #ifdef _HD_
     haveCalGroupsPassed    = isHDCalibrationRecordValid();
     hasSystemRecordPassed  = isHDSystemRecordValid();
     hasServiceRecordPassed = isHDServiceRecordValid();
 #endif
 
-    hasSWConfigRecordPassed = isSWConfigRecordValid();
-
     // If any of the records did not pass, they should be filled
     // with benign values. After that, schedule a write to sector 0
     // to re-write the records with the benign values