Index: NVDataMgmt.h
===================================================================
diff -u -r7a8126075d566078097485bf4757f2a380a1ef98 -refdbe5815e423124fdfa1a1efba8b61dacf170e8
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7a8126075d566078097485bf4757f2a380a1ef98)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision efdbe5815e423124fdfa1a1efba8b61dacf170e8)
@@ -8,7 +8,7 @@
 * @file    NVDataMgmt.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @date    (last)      15-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2020
@@ -90,7 +90,7 @@
     NVDATAMGMT_RECORDS_READ,                                    ///< NVDataMgmt records read.
     NVDATAMGMT_RECORDS_CRC_CHECKED,                             ///< NVDataMgmt records CRC checked.
     NUM_OF_NVDATAMGMT_READ_RECORDS_STATES,                      ///< Number of NVDataMgmt read records states.
-} NVDATAMGMT_RECORDS_READ_STATUS;
+} NVDATAMGMT_RECORDS_READ_STATUS_T;
 
 #pragma pack(push, 1)
 /// Read data status structure.
@@ -134,16 +134,17 @@
 
 #ifdef _DG_
 BOOL setROWaterGeneratedL( F32 liters );
-void resetROWaterGeneratedLSinceLastSrvc( void );
-BOOL setLastDisinfectDate( DG_DISINFECT_T disinfect, U32 epochTime );
+BOOL setLastDisinfectDate( DG_USAGE_INFO_ITEMS_T disinfect, U32 epochTime );
 BOOL setDisinfectStatus( BOOL disinfectStatus );
 BOOL setHeatersInfoRecord( U08 *addressPtr, U32 infoLength );
 #endif
 #ifdef _HD_
-BOOL setTxTimeHours( F32 hours, BOOL isServiceDone );
+BOOL setTxTimeHours( F32 hours );
 BOOL setTxLastStartTimeEpoch( U32 epoch );
 #endif
 
+BOOL setServiceTime( void );
+
 BOOL writeLogData( LOG_DATA_T* data );               // Phase 1B
 BOOL readLogData( READ_DATA_T* buffer, U32 length ); // Phase 1B
 
@@ -152,7 +153,7 @@
 
 void benignPolynomialCalRecord( POLYNOMIAL_CAL_PAYLOAD_T* record );
 
-NVDATAMGMT_RECORDS_READ_STATUS getNVRecordsReadStatus( void );
+NVDATAMGMT_RECORDS_READ_STATUS_T getNVRecordsReadStatus( void );
 
 BOOL enqueueNVRecordsForRead( void );