Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -re17e1dc97bf8878056f1f7e4aa861c2448db52bc -r9a14f69c0f0de343b5664b20753142b50bc4e093
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision e17e1dc97bf8878056f1f7e4aa861c2448db52bc)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 9a14f69c0f0de343b5664b20753142b50bc4e093)
@@ -52,20 +52,20 @@
 /// NVM self-test states enumeration.
 typedef enum NVM_Self_Test_States
 {
-    NVM_SELF_TEST_STATE_READ_RECORDS = 0,                                 ///< Self test read records.
-    NVM_SELF_TEST_STATE_CHECK_CRC,                                        ///< Self test check CRC.
-    NVM_SELF_TEST_STATE_COMPLETE,                                         ///< Self test complete.
-    NUM_OF_NVM_SELF_TEST_STATES                                           ///< Total number of self-test states.
+    NVM_SELF_TEST_STATE_READ_RECORDS = 0,                                       ///< Self test read records.
+    NVM_SELF_TEST_STATE_CHECK_CRC,                                              ///< Self test check CRC.
+    NVM_SELF_TEST_STATE_COMPLETE,                                               ///< Self test complete.
+    NUM_OF_NVM_SELF_TEST_STATES                                                 ///< Total number of self-test states.
 } NVM_SELF_TEST_STATE_T;
 
 /// Process records specifications structure
 typedef struct
 {
-    U32 recordFlashAddress;                                                      ///< Jobs spec start address.
-    U32 sizeofRecord;                                                               ///< Jobs spec size of job.
-    U08* structAddressPtr;                                                       ///< Jobs structure address pointer.
-    U08* structCRCPtr;                                                           ///< Jobs structure CRC pointer.
-    DD_EVENT_ID_T nvEvent;                                                       ///< Jobs non-volatile DD event (i.e calibration, system).
+    U32 recordFlashAddress;                                                     ///< Jobs spec start address.
+    U32 sizeofRecord;                                                           ///< Jobs spec size of job.
+    U08* structAddressPtr;                                                      ///< Jobs structure address pointer.
+    U08* structCRCPtr;                                                          ///< Jobs structure CRC pointer.
+    DD_EVENT_ID_T nvEvent;                                                      ///< Jobs non-volatile DD event (i.e calibration, system).
 } PROCESS_RECORD_SPECS_T;
 
 /// DD available NV data to get
@@ -257,12 +257,14 @@
     U32 maxDialysateFlowMLPM;                                                   ///< Max dialysate flow in mL/min.
     F32 minDialysateTempC;                                                      ///< Min dialysate temperature in C.
     F32 maxDialysateTempC;                                                      ///< Max dialysate temperature in C.
-    F32 acidConcentrate;                                                        ///< acid concentrate
-    F32 bicarbCartridgeSizeG;                                                   ///< bicarbonate cartridge size in grams.
-    F32 minSodiumMEQL;                                                          ///< Min sodium in mEq/L
-    F32 maxSodiumMEQL;                                                          ///< Max sodium in mEq/L
-    F32 minBicarbonateMEQL;                                                     ///< Min bicarbonate in mEq/L
-    F32 maxBicarbonateMEQL;                                                     ///< Max bicarbonate in mEq/L
+    U32 minAcidConcentrate;                                                     ///< Min acid concentrate
+    U32 maxAcidConcentrate;                                                     ///< Max acid concentrate
+    U32 minBicarbCartridgeSizeG;                                                ///< Min bicarbonate cartridge size in grams.
+    U32 maxBicarbCartridgeSizeG;                                                ///< Max bicarbonate cartridge size in grams.
+    U32 minSodiumMEQL;                                                          ///< Min sodium in mEq/L
+    U32 maxSodiumMEQL;                                                          ///< Max sodium in mEq/L
+    U32 minBicarbonateMEQL;                                                     ///< Min bicarbonate in mEq/L
+    U32 maxBicarbonateMEQL;                                                     ///< Max bicarbonate in mEq/L
     U32 minRORejectionRatioPCT;                                                 ///< Min RO rejection ratio in percent.
     U32 disinfectionFrequency;                                                  ///< Disinfection days between cycles.
     F32 disinfectionCycleTime;                                                  ///< Disinfection Cycle Time
@@ -295,13 +297,15 @@
 // ********** public function prototypes **********
 
 void initNVRecordsDD( void );
-SELF_TEST_STATUS_T execNVMSelfTest ( void );
+SELF_TEST_STATUS_T execNVMRecordsSelfTest ( void );
 PROCESS_RECORD_SPECS_T getProcessRecord( NVM_RECORD_TYPE_T job );
 PROCESS_RECORD_SPECS_T getTemporaryRxRecord( NVM_RECORD_TYPE_T job );
 void benignPolynomialCalRecord( POLYNOMIAL_CAL_PAYLOAD_T* record );
 BOOL setLastDisinfectDate( DD_USAGE_INFO_ITEMS_T disinfect, U32 epochTime );
 BOOL setServiceTime( void );
-BOOL getNVRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength,
+U32 getMinRORejectionRatioInInstitRecordPCT( void );
+F32 getMinInletWaterConductivityLimitInstitRecordUSPCM( void );
+BOOL getNVMRecord( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength,
                          U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm );
 void updateNVSelfTestResult( SELF_TEST_STATUS_T result );
 void updateNVSelfTestState( NVM_SELF_TEST_STATE_T state );