Index: NVDataMgmt.c
===================================================================
diff -u -rb6d79e26e36d4a942ff5dbf720086316788796fd -r2b28cd685e59e65b4aba12a1fb3370c4415ef076
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision b6d79e26e36d4a942ff5dbf720086316788796fd)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2b28cd685e59e65b4aba12a1fb3370c4415ef076)
@@ -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
@@ -2224,16 +2224,6 @@
 #endif
                     break;
 
-#ifdef _DG_
-#if 0
-                // For Phase 1B
-                case NVDATAMGMT_SCHEDULED_RUNS_RECORD:
-                    // Pass the information to the CAN bus
-                    sendDGScheduledRunsRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
-                    // There are no scheduled runs for HD right now.
-                    break;
-#endif
-#endif
                 case NVDATAMGMT_SW_CONFIG_RECORD:
 #ifdef _DG_
                     sendDGSWConfigRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
@@ -3796,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;