Index: NVDataMgmt.h
===================================================================
diff -u -r7ff7e715f7a15da5f4055b33e186d58cf96fe909 -rd6f53ebf6c481cb909720a2c6910ae89addc6801
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7ff7e715f7a15da5f4055b33e186d58cf96fe909)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision d6f53ebf6c481cb909720a2c6910ae89addc6801)
@@ -114,6 +114,14 @@
 {
     char disinfectionDate [ MAX_DATE_CHARACTERS ];              ///< Disinfection Date
 } DISINFECTION_DATE_T;
+
+/// Payload record structure for a linear calibration message.
+typedef struct
+{
+    F32 gain;
+    F32 offset;
+} LINEAR_F32_CAL_PAYLOAD_T;
+
 #pragma pack(pop)
 
 void initNVDataMgmt ( void );
@@ -125,35 +133,28 @@
 SELF_TEST_STATUS_T execNVDataMgmtSelfTest ( void );
 
 BOOL setBootloaderFlag ( U32 flag );
-
 U32  getBootloaderFlag ( void );
 
 BOOL setMfgData ( MFG_DATA_T data );
-
 BOOL getMfgData ( MFG_DATA_T* buffer );
 
 BOOL setCalibrationData ( CALIBRATION_DATA_T data );
-
 BOOL getCalibrationData ( CALIBRATION_DATA_T* buffer );
+BOOL testResetCalibrationData( U32 key );
 
 BOOL setServiceDate ( SERVICE_DATA_T data );
-
 BOOL getServiceDate ( SERVICE_DATA_T* buffer );
 
 BOOL setTreatmentTime ( U32 hours );
-
 U32  getTreatmentTime ( void );
 
 BOOL setWaterConsumption ( U32 liters );
-
 U32  getWaterConsumption ( void );
 
 BOOL setDisinfectionDate ( DISINFECTION_DATE_T date );
-
 BOOL getDisinfectionDate ( DISINFECTION_DATE_T* buffer );
 
 BOOL writeLogData ( LOG_DATA_T* data );
-
 BOOL readLogData ( READ_DATA_T* buffer, U32 length );
 
 /**@}*/