Index: NVDataMgmt.h
===================================================================
diff -u -r89f99fccb9ae7dda71cfef84d4ea8cb59502fa9a -r0ee608e8de70aef91f5bdf7ebfa1f1cccf2e43dd
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 89f99fccb9ae7dda71cfef84d4ea8cb59502fa9a)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 0ee608e8de70aef91f5bdf7ebfa1f1cccf2e43dd)
@@ -45,12 +45,13 @@
     NUM_OF_MFG_LOC                                              ///< Number of manufacturing location.
 } MFG_LOCATION_T;
 
-typedef enum last_service_location
+/// Service location enumeration.
+typedef enum service_location
 {
-    LAST_SERVICE_LOC_FACTORY = 0,                               ///< Last service location factory (HD/DG).
-    LAST_SERVICE_LOC_FIELD,                                     ///< Last service location field (HD/DG).
-    NUM_OF_LAST_SERVICE_LOC                                     ///< Number of last service location.
-} LAST_SERVICE_LOCATION_T;
+    SERVICE_LOC_FACTORY = 0,                                    ///< Service location factory (HD/DG).
+    SERVICE_LOC_FIELD,                                          ///< Service location field (HD/DG).
+    NUM_OF_SERVICE_LOC                                          ///< Number of service location.
+} SERVICE_LOCATION_T;
 
 /// Log event enumeration.
 typedef enum log_event
@@ -167,6 +168,15 @@
     NUM_OF_CAL_DATA_BICARB_CONCENTRATES
 } CAL_DATA_DG_BICARB_CONCENTRATE_T;
 
+/// DG scheduled runs
+typedef enum dg_scheduled_runs
+{
+    FLUSH = 0,
+    HEAT_DISINFECT,
+    CHEMICAL_DISINFECT,
+    NUM_OF_DG_SCHEDULED_RUNS
+} SCHEDULED_DG_RUNS_T;
+
 #pragma pack(push, 1)
 /// Payload record structure for a linear calibration message. TODO remove
 typedef struct
@@ -368,16 +378,26 @@
     U16 crc;                                                                                                    ///< CRC for the DG system record structure.
 } DG_SYSTEM_RECORD_T;
 
-/// DG last service record structure
+/// DG service record structure
 typedef struct
 {
-    LAST_SERVICE_LOCATION_T lastServiceLoc;                                                                     ///< DG last service location.
-    U32 lastServiceDate;                                                                                        ///< DG last service date.
+    SERVICE_LOCATION_T lastServiceLoc;                                                                          ///< DG service location.
+    U32 lastServiceDate;                                                                                        ///< DG service date.
     U16 crc;                                                                                                    ///< CRC for the DG last service record structure.
-} DG_LAST_SERVICE_RECORD_T;
+} DG_SERVICE_RECORD_T;
 
+typedef struct
+{
+    U32 lastRunTime;
+    U16 crc;
+} DG_SCHEDULED_RUN_T;
 
-/********************** OLD STRUCTS REMOVE ******************/
+typedef struct
+{
+    DG_SCHEDULED_RUN_T dgScheduledRun[ NUM_OF_DG_SCHEDULED_RUNS ];
+} DG_SCHEDULED_RUN_RECORD_T;
+
+/********************** OLD STRUCTS TODO REMOVE ******************/
 /// Manufacturing data structure. TODO remove
 typedef struct mfg_Data
 {
@@ -456,12 +476,16 @@
 BOOL getSystemRecord( void );
 BOOL setSystemRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 
-BOOL getLastServiceRecord( void );
-BOOL setLastServiceRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
+BOOL getServiceRecord( void );
+BOOL setServiceRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 
+BOOL getScheduledRunsRecord( void );
+BOOL setScheduledRunsRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
+
 DG_PRES_SENSORS_CAL_RECORD_T getDGPressureSensorsCalibrationRecord( void );
 void getDGFlowSensorsCalibrationRecord( U08* buffer );
 
+// TODO clean up
 BOOL setBootloaderFlag ( U32 flag );
 U32  getBootloaderFlag ( void );