Index: NVDataMgmt.h
===================================================================
diff -u -rb46d288230d4e6aa32a7a2764c3d392c4dce0121 -r6a00bc5632cfdb84cf72e7dbbc55ff115e3481d5
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision b46d288230d4e6aa32a7a2764c3d392c4dce0121)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 6a00bc5632cfdb84cf72e7dbbc55ff115e3481d5)
@@ -19,6 +19,8 @@
 
 #include "Common.h"
 
+// ********** public definitions **********
+
 #define MAX_SYS_SERIAL_NUMBER_CHARACTERS 7U                     ///< Max number of characters for SYS serial number
 #define MAX_HW_SERIAL_NUMBER_CHARACTERS  5U                     ///< Max number of characters for HD serial number
 #define MAX_DATE_CHARACTERS              10U                    ///< Max number of characters for date
@@ -52,21 +54,31 @@
     char mfgDate         [ MAX_DATE_CHARACTERS ];               ///< Manufacturing date
 } MFG_DATA_T;
 
+/// Calibration data struct
+typedef struct calibration_Data
+{
+    U32 calRecordRevision;                                      ///< Revision of calibration record (rev when structure changes to determine compatibility with f/w version)
+    S32 accelXOffset;                                           ///< Accelerometer X axis offset
+    S32 accelYOffset;                                           ///< Accelerometer Y axis offset
+    S32 accelZOffset;                                           ///< Accelerometer Z axis offset
+#ifdef _HD_
+    F32 bloodFlowGain;                                          ///< Gain for blood flow sensor
+    F32 bloodFlowOffset_mL_min;                                 ///< Offset for blood flow sensor
+    char calDateBloodFlow[ MAX_DATE_CHARACTERS ];               ///< Last calibration date of blood flow sensor
+    F32 dialysateFlowGain;                                      ///<
+    F32 dialysateFlowOffset_mL_min;                             ///<
+    char calDateDialysateFlow[ MAX_DATE_CHARACTERS ];           ///< Last calibration date of blood flow sensor
+#endif
+    U16 crc;                                                    ///< CRC for this calibration record
+} CALIBRATION_DATA_T;
+
 /// Service dates struct
 typedef struct service_dates
 {
     char currentServiceDate [ MAX_DATE_CHARACTERS ];            ///< Current service date
     char nextServiceDate    [ MAX_DATE_CHARACTERS ];            ///< Next service date
 } SERVICE_DATA_T;
 
-/// Calibration data struct
-typedef struct calibration_Data
-{
-    F32 occSensorOffset;                                        ///< Item 1
-    F32 tempSensorOffset;                                       ///< Item 2
-    char calibrationDate [ MAX_DATE_CHARACTERS ];               ///< Calibration date
-} CALIBRATION_DATA_T;
-
 /// Read data status
 typedef struct get_data
 {