Index: NVDataMgmt.c
===================================================================
diff -u -r0c4d01c24895bf4c46b52c75eacf20e1dad4bf76 -r0b10349505c18d7789b9174a383836c6a1ad2936
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0c4d01c24895bf4c46b52c75eacf20e1dad4bf76)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0b10349505c18d7789b9174a383836c6a1ad2936)
@@ -440,8 +440,8 @@
 #ifndef _RELEASE_
   {SW_CONFIGS_START_ADDRESS,            sizeof(DG_SW_CONFIG_GROUP_T),       MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgSWConfigGroup,      (U08*)&dgSWConfigGroup.crc,       NVDATAMGMT_RTC,     DG_EVENT_SW_CONFIG_UPDATE },        // NVDATAMGMT_SW_CONFIG_RECORD
 #endif
-  {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,     DG_EVENT_NO_EVENT },                // 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,     DG_EVENT_NO_EVENT },                // NVDATAMGMT_HEATERS_INFO_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,     DG_EVENT_SCHEDULED_RUNS_UPDATE },   // 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,     DG_EVENT_HEATERS_INFO_UPDATE },     // NVDATAMGMT_HEATERS_INFO_RECORD
   {DG_USAGE_INFO_START_ADDRESS,         sizeof(DG_USAGE_INFO_GROUP_T),      MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgUsageInfoGroup,     (U08*)&dgUsageInfoGroup.crc,      NVDATAMGMT_RTC,     DG_EVENT_USAGE_INFO_UPDATE }        // NVDATAMGMT_USAGE_INFO_RECORD
 };
 #endif
@@ -3786,6 +3786,11 @@
     BOOL status        = FALSE;
     BOOL checkUIStatus = TRUE;
 
+    // Initialize the structure per CPPCheck run
+    tempJob.memoryLocation  = NVDATAMGMT_EEPROM;
+    tempJob.memoryOperation = NVDATAMGMT_NONE;
+    tempJob.recordJob       = NVDATAMGMT_CALIBRATION_RECORD;
+
     _disable_IRQ();
     tempIndex = recordQueueFrontIndex;