Index: NVDataMgmt.c
===================================================================
diff -u -rd4aea540d447203cfd9aca91281d1dc9e9e9bc1d -r03eaec1ba61d804bd22664d4a2c5e033fd77a302
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d4aea540d447203cfd9aca91281d1dc9e9e9bc1d)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 03eaec1ba61d804bd22664d4a2c5e033fd77a302)
@@ -265,6 +265,7 @@
 
 // ********** HD/DG record structures **********
 
+#ifdef _DG_
 /// DG calibration groups structure
 typedef struct
 {
@@ -321,7 +322,21 @@
                  RECORD_BYTE_SIZE(DG_SCHEDULED_RUN_RECORD_T) ];                                                 ///< DG scheduled run group padding.
     U16 crc;                                                                                                    ///< CRC for the DG automated test time structure.
 } DG_SCHEDULED_RUNS_GROUP_T;
+#endif
 
+#ifdef _HD_
+/// HD calibration groups structure
+typedef struct
+{
+    HD_PUMPS_CAL_RECORD_T  pumpsCalRecord;
+    HD_VALVES_CAL_RECORD_T valvesCalRecord;
+    HD_OCCLUSION_SENSORS_CAL_RECORD_T occlusionSensorsCalRecord;
+    HD_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord;
+    HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;
+    HD_TEMP_SENSORS_CAL_RECORD_T tempSensorsCalRecord;
+    HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T heparinForceSensorCalRecord;
+} HD_CALIBRATION_GROUPS;
+
 /// HD calibration records structure
 typedef struct
 {
@@ -332,6 +347,7 @@
 {
     HD_CALIBRATION_GROUPS_T hdCalibrationGroups;
 } HD_CALIBRATION_RECORD_T;
+#endif
 
 #pragma pack(pop)
 
@@ -348,7 +364,8 @@
     {SERVICE_RECORD_START_ADDRESS,      sizeof(DG_SERVICE_GROUP_T),             MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgServiceGroup,        (U08*)&dgServiceGroup.crc},            // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
     {DG_SCHEDULED_RUNS_START_ADDRESS,   sizeof(DG_SCHEDULED_RUNS_GROUP_T),      MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&dgScheduledRunGroup,   (U08*)&dgScheduledRunGroup.crc}      // NVDATAMGMT_SCHEDULER_RECORD
 };
-#else if _HD_
+#endif
+#ifdef _HD_
 static HD_CALIBRATION_RECORD_T      hdCalibrationRecord;                                                        ///< HD calibration record.
 #endif
 static RECORD_JOBS_STATE_T          recordToPublish;                                                            ///< Record to publish (i.e. calibration, system)
@@ -360,7 +377,7 @@
 static U32                          calSendDataIntervalCounter = 0;                                             ///< Calibration data send to CAN bust interval counter.
 static U32                          previousCalMessageNum = 0;                                                  ///< Calibration previous message number.
 static U32                          recordUpdateAddress = 0;                                                    ///< DG record update address for all the write operations.
-static U32                          recordReceiveStartTime = 0;                                                ///< Time stamp the calibration/service was received.
+static U32                          recordReceiveStartTime = 0;                                                 ///< Time stamp the calibration/service was received.
 static PROCESS_RECORD_JOB_T         recordJobQueue[ QUEUE_MAX_SIZE ];                                           ///< Record queue jobs.
 static U08                          recordQueueRearIndex;                                                       ///< Record queue rear index.
 static U08                          recordQueueFrontIndex;                                                      ///< Record queue front index.
@@ -473,22 +490,6 @@
     Fapi_initializeFlashBanks( ROUNDED_HCLK_FREQ );
     Fapi_setActiveFlashBank( Fapi_FlashBank7 );
     Fapi_enableEepromBankSectors( BANK7_SECTOR_0_31_ENABLE_BIT_MASK, BANK7_SECTOR_32_63_ENABLE_BIT_MASK );
-
-    // TODO FOR TESTING ONLY, REMOVE
-    dgCalibrationRecord.dgCalibrationGroups.presSensorsCalRecord.pressureSensors[0].offset = 5.69;
-    dgCalibrationRecord.dgCalibrationGroups.presSensorsCalRecord.pressureSensors[0].gain = 15.2;
-    dgCalibrationRecord.dgCalibrationGroups.presSensorsCalRecord.pressureSensors[0].calibrationTime = 12345;
-    dgCalibrationRecord.dgCalibrationGroups.presSensorsCalRecord.pressureSensors[0].crc = 159;
-
-    dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord.condSensors[CAL_DATA_CD2_COND_SENSOR].gain = 56.89;
-    dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord.condSensors[CAL_DATA_CD2_COND_SENSOR].offset = 122.3;
-    dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord.condSensors[CAL_DATA_CD2_COND_SENSOR].calibrationTime = 567890;
-    dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord.condSensors[CAL_DATA_CD2_COND_SENSOR].crc = 3579;
-    //dgCalibrationRecord.pumpsCalRecord.roPump.gain3Ratio = 56.78;
-    //dgCalibrationRecord.pumpsCalRecord.roPump.calibrationTime = 85236;
-    //dgCalibrationRecord.pumpsCalRecord.roPump.crc = 6789;
-    dgCalibrationRecord.crc = 23678;
-    // TODO FOR TESTING ONLY, REMOVE
 }
 
 /*********************************************************************//**
@@ -1099,6 +1100,7 @@
     return status;
 }
 
+#ifdef _DG_
 /*********************************************************************//**
  * @brief
  * The getDGPressureSensorsCalibrationRecord function returns the DG pressure
@@ -1289,6 +1291,7 @@
 {
     return dgScheduledRunGroup.dgScheduledRun;
 }
+#endif
 
 /*********************************************************************//**
  * @brief