Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r363cb32e448a75b1c62e5344ee246f5a32fd2466 -r8dc8551a200e8353a563828ccc8dcb4ad9f47bfb
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 363cb32e448a75b1c62e5344ee246f5a32fd2466)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 8dc8551a200e8353a563828ccc8dcb4ad9f47bfb)
@@ -1,3 +1,19 @@
+/**************************************************************************
+*
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file    NVDataMgmtHDRecords.h
+*
+* @author  (last)      Dara Navaei
+* @date    (last)      20-Jul-2021
+*
+* @author  (original)  Dara Navaei
+* @date    (original)  13-Feb-2021
+*
+***************************************************************************/
 
 
 #ifndef FWCOMMON_NVDATAMGMTHDRECORDS_H_
@@ -19,21 +35,6 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 15U                                                                             ///< Max number of characters for top level serial number.
 
-/// Manufacturing location enumeration.
-typedef enum mfg_location
-{
-    MFG_LOC_FACTORY = 0,                                                                                       ///< Manufacturing location (HD/DG).
-    NUM_OF_MFG_LOC                                                                                             ///< Number of manufacturing location.
-} MFG_LOCATION_T;
-
-/// Service location enumeration.
-typedef enum service_location
-{
-    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;
-
 /// HD pumps enumeration.
 typedef enum hd_pumps
 {
@@ -66,7 +67,7 @@
 typedef enum hd_flow_sensors
 {
     CAL_DATA_HD_BLOOD_FLOW_SENSOR = 0,                                                                          ///< Blood flow sensor.
-    CAL_DATA_HD_DIALYZER_FLOW_SENSOR,                                                                           ///< Dialyzer flow sensor.
+    CAL_DATA_HD_DIALYSATE_FLOW_SENSOR,                                                                          ///< Dialyzer flow sensor.
     NUM_OF_CAL_DATA_HD_FLOW_SENSORS,                                                                            ///< Number of HD flow sensors.
 } CAL_DATA_HD_FLOW_SENSORS_T;
 
@@ -177,16 +178,17 @@
 {
     char topLevelPN[ MAX_TOP_LEVEL_PN_CHARS ];                                                                  ///< HD top level part number.
     char topLevelSN[ MAX_TOP_LEVEL_SN_CHARS ];                                                                  ///< HD top level serial number.
-    MFG_LOCATION_T mfgLocation;                                                                                 ///< HD manufacturing location.
+    U08 mfgLocation;                                                                                            ///< HD manufacturing location.
     U32 mfgDate;                                                                                                ///< HD manufacturing date.
     U16 crc;                                                                                                    ///< CRC for the HD system record structure.
 } HD_SYSTEM_RECORD_T;
 
 /// HD service record structure
 typedef struct
 {
-    SERVICE_LOCATION_T serviceLoc;                                                                              ///< HD service location.
-    U32 serviceDate;                                                                                            ///< HD service date.
+    U08 serviceLoc;                                                                                             ///< HD service location.
+    U32 lastServiceEpochDate;                                                                                   ///< HD last service date in epoch.
+    U32 serviceIntervalSeconds;                                                                                 ///< HD service interval in seconds.
     U16 crc;                                                                                                    ///< CRC for the HD service record structure.
 } HD_SERVICE_RECORD_T;