Index: NVDataMgmt.h
===================================================================
diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -r7d3731085a0c0a51daf7733236461f4f56a1126a
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 54a9bd09d6714d7faaa186959988a75ef3b83557)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
@@ -22,6 +22,8 @@
 
 #ifdef _HD_
     #include "NVDataMgmtHDRecords.h"
+    #include "OperationModes.h"
+    #include "HDDefs.h"
 #endif
 #ifdef _DG_
     #include "NVDataMgmtDGRecords.h"
@@ -38,6 +40,11 @@
 
 // ********** public definitions **********
 
+#ifndef _RELEASE_
+#define SW_CONFIG_ENABLE_VALUE    1                             ///< Software configuration enable.
+#define SW_CONFIG_DISABLE_VALUE   0                             ///< Software configuration disable.
+#endif
+
 /// Log event enumeration.
 typedef enum log_event
 {
@@ -58,6 +65,20 @@
    NVDATAMGMT_READ_COMPLETE                                     ///< Read status complete.
 } NVDATAMGMT_READ_STATUS_T;
 
+/// NVDataMgmt records' jobs states
+typedef enum NVDataMgmt_Records_Jobs
+{
+    NVDATAMGMT_CALIBRATION_RECORD = 0,                          ///< NVDataMgmt process write calibration record.
+    NVDATAMGMT_SYSTEM_RECORD,                                   ///< NVDataMgmt process write system record.
+    NVDATAMGMT_SERVICE_RECORD,                                  ///< NVDataMgmt process service record.
+    NVDATAMGMT_SW_CONFIG_RECORD,                                ///< NVDataMgmt process software record.
+#ifdef _DG_
+    NVDATAMGMT_SCHEDULED_RUNS_RECORD,                           ///< NVDataMgmt process scheduled runs record.
+    NVDATAMGMT_HEATERS_INFO_RECORD,                             ///< NVDataMgmt process heaters info record.
+#endif
+    NUM_OF_NVDATMGMT_RECORDS_JOBS                               ///< Number of NVDataMgmt records jobs.
+} RECORD_JOBS_STATE_T;
+
 #pragma pack(push, 1)
 /// Read data status structure.
 typedef struct get_data
@@ -94,61 +115,24 @@
 
 BOOL getNVRecord2Driver( NV_DATA_T nvData, U08* bufferAddress, U32 bufferLength, U08 numOfSnsrs2Check, ALARM_ID_T nvAlarm );
 
+U08 getSoftwareConfigStatus( SOFTWARE_CONFIG_T config );
+
 #ifdef _DG_
-DG_TEMP_SENSORS_CAL_RECORD_T         getDGTemperatureSensorsCalibrationRecord( void );
-DG_COND_SENSORS_CAL_RECORD_T         getDGConducitivitySensorsCalibrationRecord( void );
-DG_RO_PUMP_CAL_RECORD_T              getDGROPumpRecord( void );
-DG_CONC_PUMPS_CAL_RECORD_T           getDGConcetnratePumpsRecord( void );
-DG_DRAIN_PUMP_CAL_RECORD_T           getDGDrainPumpRecord( void );
-DG_DRAIN_LINE_VOLUME_T               getDGDrainLineVolumeRecord( void );
-DG_PRE_RO_PURGE_VOLUME_T             getDGPreROPurgeVolumeRecord( void );
-DG_RESERVOIR_VOLUME_RECORD_T         getDGReservoirsVolumeRecord( void );
-DG_FILTERS_CAL_RECORD_T              getDGFiltersRecord( void );
-DG_FANS_CAL_RECORD_T                 getDGFansRecord( void );
-DG_ACCEL_SENSOR_CAL_RECORD_T         getDGAccelerometerSensorCalibrationRecord( void );
-DG_SYSTEM_RECORD_T                   getDGSystemRecord( void );
-DG_SERVICE_RECORD_T                  getDGServiceRecord( void );
-DG_SCHEDULED_RUN_RECORD_T            getDGScheduledRunsRecord( void );
-BOOL                                 setWaterConsumption ( U32 liters );
-U32                                  getWaterConsumption ( void );
-BOOL                                 setHeatersInfoRecord( U08 *addressPtr );
+BOOL setWaterConsumption ( U32 liters );
+U32  getWaterConsumption ( void );
+BOOL setHeatersInfoRecord( U08 *addressPtr, U32 infoLength );
 #endif
 #ifdef _HD_
-HD_PUMPS_CAL_RECORD_T                getHDPumpsCalibrationRecord( void );
-HD_VALVES_CAL_RECORD_T               getHDValvesCalibrationRecord( void );
-HD_OCCLUSION_SENSORS_CAL_RECORD_T    getHDOcclusionSensrosCalibrationRecord( void );
-HD_FLOW_SENSORS_CAL_RECORD_T         getHDFlowSensorsCalibrationRecord( void );
-HD_PRESSURE_SENSORS_CAL_RECORD_T     getHDPressureSensorsCalibrationRecord( void );
-HD_TEMP_SENSORS_CAL_RECORD_T         getHDTemperatureSensorsCalibrationRecord( void );
-HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T getHDHeparinForceSensorCalibrationRecord( void );
-HD_ACCELEROMETER_SENSOR_CAL_RECORD_T getHDAccelerometerSensorCalibrationRecord( void );
-HD_SYSTEM_RECORD_T                   getHDSystemRecord( void );
-HD_SERVICE_RECORD_T                  getHDServiceRecord( void );
-BOOL                                 setTreatmentTime ( U32 hours );
-U32                                  getTreatmentTime ( void );
+BOOL setTreatmentTime ( U32 hours );
+U32  getTreatmentTime ( void );
 #endif
 
 BOOL writeLogData( LOG_DATA_T* data );
 BOOL readLogData( READ_DATA_T* buffer, U32 length );
 
-// From Dialin
-BOOL getCalibrationRecord( void );
-BOOL setCalibrationRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
+BOOL sendRecordToDialin( RECORD_JOBS_STATE_T job );
+BOOL receiveRecordFromDialin( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 
-// From Dialin
-BOOL getSystemRecord( void );
-BOOL setSystemRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
-
-// From Dialin
-BOOL getServiceRecord( void );
-BOOL setServiceRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
-
-#ifdef _DG_
-// From Dialin
-BOOL getScheduledRunsRecord( void );
-BOOL setScheduledRunsRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
-#endif
-
 /**@}*/
 
 #endif