Index: NVDataMgmt.h
===================================================================
diff -u -r5d12a10f75c6655992acb911af4bf339b2eb955b -r63224e051e2c46221bd5fa8505da344d4294b307
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 5d12a10f75c6655992acb911af4bf339b2eb955b)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 63224e051e2c46221bd5fa8505da344d4294b307)
@@ -59,25 +59,24 @@
 } NVDATAMGMT_READ_STATUS_T;
 
 #pragma pack(push, 1)
-
 /// Read data status structure.
 typedef struct get_data
 {
-    NVDATAMGMT_READ_STATUS_T status;                            ///< Read data status
-    U08* externalBuffer;                                        ///< External buffer address
+    NVDATAMGMT_READ_STATUS_T status;                            ///< Read data status.
+    U08* externalBuffer;                                        ///< External buffer address.
 } READ_DATA_T;
 
 /// Log data structure.
 typedef struct
 {
-    U32 epochTime;                                              ///< Log data time in epoch
-    U32 eventCode;                                              ///< Log data event code
-    U32 subCode;                                                ///< Log data sub code
-    F32 data1;                                                  ///< Log data 1
-    F32 data2;                                                  ///< Log data 2
-    F32 data3;                                                  ///< Log data 3
-    F32 data4;                                                  ///< Log data 4
-    F32 data5;                                                  ///< Log data 5
+    U32 epochTime;                                              ///< Log data time in epoch.
+    U32 eventCode;                                              ///< Log data event code.
+    U32 subCode;                                                ///< Log data sub code.
+    F32 data1;                                                  ///< Log data 1.
+    F32 data2;                                                  ///< Log data 2.
+    F32 data3;                                                  ///< Log data 3.
+    F32 data4;                                                  ///< Log data 4.
+    F32 data5;                                                  ///< Log data 5.
 } LOG_DATA_T;
 #pragma pack(pop)
 
@@ -122,7 +121,9 @@
 DG_ACCELEROMETER_SENSOR_CAL_RECORD_T getDGAccelerometerSensorCalibrationRecord( void );
 DG_SYSTEM_RECORD_T                   getDGSystemRecord( void );
 DG_SERVICE_RECORD_T                  getDGServiceRecord( void );
-DG_SCHEDULED_RUN_RECORD_T            getDGScheduledRunRecord( void );
+DG_SCHEDULED_RUN_RECORD_T            getDGScheduledRunsRecord( void );
+BOOL                                 setWaterConsumption ( U32 liters );
+U32                                  getWaterConsumption ( void );
 #endif
 #ifdef _HD_
 HD_PUMPS_CAL_RECORD_T                getHDPumpsCalibrationRecord( void );
@@ -135,15 +136,9 @@
 HD_ACCELEROMETER_SENSOR_CAL_RECORD_T getHDAccelerometerSensorCalibrationRecord( void );
 HD_SYSTEM_RECORD_T                   getHDSystemRecord( void );
 HD_SERVICE_RECORD_T                  getHDServiceRecord( void );
+BOOL                                 setTreatmentTime ( U32 hours );
+U32                                  getTreatmentTime ( void );
 #endif
-#ifdef _HD_
-BOOL setTreatmentTime ( U32 hours );
-U32  getTreatmentTime ( void );
-#endif
-#ifdef _DG_
-BOOL setWaterConsumption ( U32 liters );
-U32  getWaterConsumption ( void );
-#endif
 
 BOOL writeLogData ( LOG_DATA_T* data );
 BOOL readLogData ( READ_DATA_T* buffer, U32 length );