Index: Accel.c
===================================================================
diff -u -rab745156d182ac1ee04a98aa2b2af0f30c8894e6 -rc1881f60c442c55ec04b54b8ee9000d2ac9dca8d
--- Accel.c	(.../Accel.c)	(revision ab745156d182ac1ee04a98aa2b2af0f30c8894e6)
+++ Accel.c	(.../Accel.c)	(revision c1881f60c442c55ec04b54b8ee9000d2ac9dca8d)
@@ -555,18 +555,23 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execAccelTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+
+#ifdef _HD_
+    HD_ACCELEROMETER_SENSOR_CAL_RECORD_T cal = getHDAccelerometerSensorCalibrationRecord();
+#endif
+#ifdef _DG_
+    DG_ACCELEROMETER_SENSOR_CAL_RECORD_T cal = getDGAccelerometerSensorCalibrationRecord();
+#endif
 
     switch ( accelSelfTestState )
     {
-        case ACCELEROMETER_SELF_TEST_STATE_START:
-            {
-                HD_ACCELEROMETER_SENSOR_CAL_RECORD_T cal = getHDAccelerometerSensorCalibrationRecord();
+        case ACCELEROMETER_SELF_TEST_STATE_START:
 
-                accelCalOffsets[ ACCEL_AXIS_X ] = cal.accelXOffset;
-                accelCalOffsets[ ACCEL_AXIS_Y ] = cal.accelYOffset;
-                accelCalOffsets[ ACCEL_AXIS_Z ] = cal.accelZOffset;
-                accelSelfTestState = ACCELEROMETER_SELF_TEST_STATE_IN_PROGRESS;
+            accelCalOffsets[ ACCEL_AXIS_X ] = cal.accelXOffset;
+            accelCalOffsets[ ACCEL_AXIS_Y ] = cal.accelYOffset;
+            accelCalOffsets[ ACCEL_AXIS_Z ] = cal.accelZOffset;
+            accelSelfTestState = ACCELEROMETER_SELF_TEST_STATE_IN_PROGRESS;
                 //else TODO what to do with this statement?
                 {   // shouldn't get here - should have failed NV-Data POST prior
                     result = SELF_TEST_STATUS_FAILED;
@@ -577,7 +582,6 @@
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE, 0 )
 #endif
                 }
-            }
             break;
 
         case ACCELEROMETER_SELF_TEST_STATE_IN_PROGRESS: