Index: NVDataMgmt.h
===================================================================
diff -u -r7d3731085a0c0a51daf7733236461f4f56a1126a -r192c8f1aa79ad0ef4a50be44a6ba37a8939ac823
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 192c8f1aa79ad0ef4a50be44a6ba37a8939ac823)
@@ -8,7 +8,7 @@
 * @file    NVDataMgmt.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @date    (last)      15-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2020
@@ -71,14 +71,27 @@
     NVDATAMGMT_CALIBRATION_RECORD = 0,                          ///< NVDataMgmt process write calibration record.
     NVDATAMGMT_SYSTEM_RECORD,                                   ///< NVDataMgmt process write system record.
     NVDATAMGMT_SERVICE_RECORD,                                  ///< NVDataMgmt process service record.
+#ifndef _RELEASE
     NVDATAMGMT_SW_CONFIG_RECORD,                                ///< NVDataMgmt process software record.
+#endif
 #ifdef _DG_
     NVDATAMGMT_SCHEDULED_RUNS_RECORD,                           ///< NVDataMgmt process scheduled runs record.
     NVDATAMGMT_HEATERS_INFO_RECORD,                             ///< NVDataMgmt process heaters info record.
 #endif
+    NVDATAMGMT_USAGE_INFO_RECORD,                               ///< NVDataMgmt process usage info record.
     NUM_OF_NVDATMGMT_RECORDS_JOBS                               ///< Number of NVDataMgmt records jobs.
 } RECORD_JOBS_STATE_T;
 
+/// NVDataMgmt records read status
+typedef enum NVDataMgmt_NV_Records_Read_Status
+{
+    NVDATAMGMT_RECORDS_NOT_STARTED = 0,                         ///< NVDataMgmt records not started.
+    NVDATAMGMT_RECORDS_QUEUED,                                  ///< NVDataMgmt records queued.
+    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;
+
 #pragma pack(push, 1)
 /// Read data status structure.
 typedef struct get_data
@@ -101,38 +114,48 @@
 } LOG_DATA_T;
 #pragma pack(pop)
 
-void initNVDataMgmt ( void );
+void initNVDataMgmt( void );
 
 void signalPowerOffWarning( void );
 
-void execNVDataMgmt ( void );
+void execNVDataMgmt( void );
 
-SELF_TEST_STATUS_T execNVDataMgmtSelfTest ( void );
+SELF_TEST_STATUS_T execNVDataMgmtSelfTest( void );
 
 void execNVDataMgmtProcessRecord( void );
 
 BOOL isNewCalibrationRecordAvailable( void );
 
 BOOL getNVRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm );
 
+#ifndef _RELEASE_
 U08 getSoftwareConfigStatus( SOFTWARE_CONFIG_T config );
+#endif
 
 #ifdef _DG_
-BOOL setWaterConsumption ( U32 liters );
-U32  getWaterConsumption ( void );
+BOOL setROWaterGeneratedL( F32 liters );
+void resetROWaterGeneratedLSinceLastSrvc( void );
+BOOL setLastDisinfectDate( DG_DISINFECT_T disinfect, U32 epochTime );
+BOOL setDisinfectStatus( BOOL disinfectStatus );
 BOOL setHeatersInfoRecord( U08 *addressPtr, U32 infoLength );
 #endif
 #ifdef _HD_
-BOOL setTreatmentTime ( U32 hours );
-U32  getTreatmentTime ( void );
+BOOL setTxTimeHours( F32 hours, BOOL isServiceDone );
+BOOL setTxLastStartTimeEpoch( U32 epoch );
 #endif
 
-BOOL writeLogData( LOG_DATA_T* data );
-BOOL readLogData( READ_DATA_T* buffer, U32 length );
+BOOL writeLogData( LOG_DATA_T* data );               // Phase 1B
+BOOL readLogData( READ_DATA_T* buffer, U32 length ); // Phase 1B
 
 BOOL sendRecordToDialin( RECORD_JOBS_STATE_T job );
 BOOL receiveRecordFromDialin( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 
+void benignPolynomialCalRecord( POLYNOMIAL_CAL_PAYLOAD_T* record );
+
+NVDATAMGMT_RECORDS_READ_STATUS getNVRecordsReadStatus( void );
+
+BOOL enqueueNVRecordsForRead( void );
+
 /**@}*/
 
 #endif