Index: Accel.c
===================================================================
diff -u -r17fdefc3752a193c0d2d495f1497cc8c1e35c406 -r7afc56a34c697e69faedaeffb3910b12d7d0628f
--- Accel.c	(.../Accel.c)	(revision 17fdefc3752a193c0d2d495f1497cc8c1e35c406)
+++ Accel.c	(.../Accel.c)	(revision 7afc56a34c697e69faedaeffb3910b12d7d0628f)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -94,7 +94,7 @@
 static HD_ACCELEROMETER_SENSOR_CAL_RECORD_T accelSensorCalRecord;                                 ///< HD accelerometer calibration record.
 #endif
 #ifdef _DG_
-static DG_ACCELEROMETER_SENSOR_CAL_RECORD_T accelSensorCalRecord;                                 ///< DG accelerometer calibration record.
+static DG_ACCEL_SENSOR_CAL_RECORD_T accelSensorCalRecord;                                         ///< DG accelerometer calibration record.
 #endif
 
 // ********** private function prototypes **********
@@ -505,14 +505,6 @@
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_EXCESSIVE_TILT, x, y )
 #endif
     }
-    else if ( ( TRUE == tiltErrorDetected ) && ( ( fabs( x ) > MAX_TILT_ANGLE_TO_CLEAR_ALARM ) || ( fabs( y ) > MAX_TILT_ANGLE_TO_CLEAR_ALARM ) ) )
-    {
-#ifdef _DG_
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_EXCESSIVE_TILT, x, y )
-#else
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_EXCESSIVE_TILT, x, y )
-#endif
-    }
     else if ( ( fabs( x ) <= MAX_TILT_ANGLE_TO_CLEAR_ALARM ) && ( fabs( y ) <= MAX_TILT_ANGLE_TO_CLEAR_ALARM ) )
     {
         accelTiltErrorTimerCounter = 0;
@@ -606,7 +598,7 @@
 #endif
 
 #ifdef _DG_
-    DG_ACCELEROMETER_SENSOR_CAL_RECORD_T calData = getDGAccelerometerSensorCalibrationRecord();
+    DG_ACCEL_SENSOR_CAL_RECORD_T calData = getDGAccelerometerSensorCalibrationRecord();
 #endif
 
     // Check if the calibration data that was received from NVDataMgmt is legitimate
@@ -672,7 +664,7 @@
            HD_ACCELEROMETER_SENSOR_CAL_RECORD_T cal = getHDAccelerometerSensorCalibrationRecord();
 #endif
 #ifdef _DG_
-           DG_ACCELEROMETER_SENSOR_CAL_RECORD_T cal = getDGAccelerometerSensorCalibrationRecord();
+           DG_ACCEL_SENSOR_CAL_RECORD_T cal = getDGAccelerometerSensorCalibrationRecord();
 #endif
            BOOL calStatus = processCalibrationData();