Index: NVDataMgmt.c
===================================================================
diff -u -r0ee608e8de70aef91f5bdf7ebfa1f1cccf2e43dd -rb840bc23aace9db7e7949aed313c4c315966aabd
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0ee608e8de70aef91f5bdf7ebfa1f1cccf2e43dd)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision b840bc23aace9db7e7949aed313c4c315966aabd)
@@ -548,47 +548,38 @@
     switch ( NVDataMgmtExecState )
     {
         case NVDATAMGMT_EXEC_STATE_WAIT_FOR_POST:
-
             NVDataMgmtExecState = handleExecWaitForPostState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_IDLE:
-
             NVDataMgmtExecState = handleExecIdleState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM:
-
             NVDataMgmtExecState = handleExecWriteToEEPROMState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_VERIFY_WRITE:
-
             NVDataMgmtExecState = handleExecVerifyWriteState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM:
-
             NVDataMgmtExecState = handleExecReadFromEEPROMState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_ERASE_EEPROM:
-
             NVDataMgmtExecState = handleExecEraseState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC:
-
             NVDataMgmtExecState = handleExecWriteToRAMState();
             break;
 
         case NVDATAMGMT_EXEC_STATE_READ_FROM_RTC:
-
             NVDataMgmtExecState = handleExecReadFromRAMState();
             break;
 
         default:
-
 #ifdef _DG_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE, NVDataMgmtExecState );
 #else
@@ -611,32 +602,26 @@
     switch ( NVDataMgmtSelfTestState )
     {
         case NVDATAMGMT_SELF_TEST_STATE_START:
-
             NVDataMgmtSelfTestState = handleSelfTestStart();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM:
-
             NVDataMgmtSelfTestState = handleSelfTestEnableEEPROM();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG:
-
             NVDataMgmtSelfTestState = handleSelfTestReadBootloaderFlag();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_LOG_RECORD:
-
             NVDataMgmtSelfTestState = handleSelfTestReadLogRecord();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_TREATMENT_TIME:
-
             NVDataMgmtSelfTestState = handleSelfTestReadHDTreatmentTime();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_WATER_CONSUMPTION:
-
             NVDataMgmtSelfTestState = handleSelfTestReadDGWaterConsumption();
             break;
 
@@ -646,27 +631,22 @@
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD:
-
             NVDataMgmtSelfTestState = handleSelfTestReadCalibrationRecord();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD:
-
             NVDataMgmtSelfTestState = handleSelfTestReadServiceRecord();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE:
-
             NVDataMgmtSelfTestState = handleSelfTestReadLastDisinfectionDate();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC:
-
             NVDataMgmtSelfTestState = handleSelfTestCheckCRC();
             break;
 
         case NVDATAMGMT_SELF_TEST_STATE_COMPLETE:
-
             // Done with POST. Do nothing
             break;
 
@@ -697,17 +677,14 @@
     switch ( nvDataMgmtExecProcessRecordState )
     {
         case NVDATAMGMT_PROCESS_RECORD_STATE_IDLE:
-
             nvDataMgmtExecProcessRecordState = handleExecProcessRecordIdleState();
             break;
 
         case NVDATAMGMT_PROCESS_RECORD_STATE_SEND_RECORD:
-
             nvDataMgmtExecProcessRecordState = handleExecProcessRecordSendRecordState();
             break;
 
         default:
-
 #ifdef _DG_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE, nvDataMgmtExecProcessRecordState );
 #else
@@ -879,7 +856,7 @@
     if ( RECORD_DATA_FIRST_RECEIVING_MSG_NUM == currentMessage && nvDataMgmtExecReceiveRecordState == NVDATAMGMT_RECEIVE_RECORD_IDLE )
     {
         nvDataMgmtExecReceiveRecordState = NVDATAMGMT_RECEIVE_RECORD_RECEIVE;
-        recordReceiveStartTime          = getMSTimerCount();
+        recordReceiveStartTime           = getMSTimerCount();
         previousCalMessageNum            = 0;
         recordUpdateAddress              = 0;
     }
@@ -982,7 +959,7 @@
     if ( RECORD_DATA_FIRST_RECEIVING_MSG_NUM == currentMessage && nvDataMgmtExecReceiveRecordState == NVDATAMGMT_RECEIVE_RECORD_IDLE )
     {
         nvDataMgmtExecReceiveRecordState = NVDATAMGMT_RECEIVE_RECORD_RECEIVE;
-        recordReceiveStartTime          = getMSTimerCount();
+        recordReceiveStartTime           = getMSTimerCount();
         previousCalMessageNum            = 0;
         recordUpdateAddress              = 0;
     }
@@ -1102,7 +1079,7 @@
         if ( RECORD_DATA_MAX_MESSAGE_DFFIRENCE == ( currentMessage - previousCalMessageNum ) )
         {
             // Define a pointer that points to the DG calibration record
-            PROCESS_RECORD_SPECS_T recordSpec = RECORDS_SPECS [ NVDATAMGMT_SERVICE_RECORD ];
+            PROCESS_RECORD_SPECS_T recordSpec = RECORDS_SPECS [ NVDATAMGMT_SCHEDULED_RUNS_RECORD ];
             U08* ptr = recordSpec.structAddressPtr;
 
             // Offset the pointer to length that we should start writing from
@@ -2332,26 +2309,31 @@
             switch( recordToPublish )
             {
                 case NVDATAMGMT_CALIBRATION_RECORD:
+
                     // Pass the information to the CAN bus
                     sendDGCalibrationRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
                     break;
 
                 case NVDATAMGMT_SYSTEM_RECORD:
+
                     // Pass the information to the CAN bus
                     sendDGSystemRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
                     break;
 
                 case NVDATAMGMT_SERVICE_RECORD:
+
                     // Pass the information to the CAN bus
                     sendDGServiceRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
                     break;
 
                 case NVDATAMGMT_SCHEDULED_RUNS_RECORD:
+
                     // Pass the information to the CAN bus
                     sendDGScheduledRunsRecord( calPublishMessageCount + 1, calPublishTotalMessages, length, startPtr );
                     break;
 
                 default:
+
                     //Ignore
                     break;
             }