Index: Accel.c
===================================================================
diff -u -r8dc8551a200e8353a563828ccc8dcb4ad9f47bfb -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- Accel.c	(.../Accel.c)	(revision 8dc8551a200e8353a563828ccc8dcb4ad9f47bfb)
+++ Accel.c	(.../Accel.c)	(revision 818749241853f2f2cfb7dd704ee005a75a7356ba)
@@ -496,14 +496,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 ( ( TRUE == tiltErrorDetected ) && ( ( fabs( x ) > MAX_TILT_ANGLE_TO_CLEAR_ALARM ) || ( fabs( y ) > MAX_TILT_ANGLE_TO_CLEAR_ALARM ) ) )
     {
@@ -512,7 +504,7 @@
 #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;
Index: Common.h
===================================================================
diff -u -r96dd26e1af74ab9493cd708956cee42b19344be2 -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- Common.h	(.../Common.h)	(revision 96dd26e1af74ab9493cd708956cee42b19344be2)
+++ Common.h	(.../Common.h)	(revision 818749241853f2f2cfb7dd704ee005a75a7356ba)
@@ -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.
Index: MessageSupport.c
===================================================================
diff -u -r8dc8551a200e8353a563828ccc8dcb4ad9f47bfb -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- MessageSupport.c	(.../MessageSupport.c)	(revision 8dc8551a200e8353a563828ccc8dcb4ad9f47bfb)
+++ MessageSupport.c	(.../MessageSupport.c)	(revision 818749241853f2f2cfb7dd704ee005a75a7356ba)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "MessageSupport.h"
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 
Index: NVDataMgmt.c
===================================================================
diff -u -r8dc8551a200e8353a563828ccc8dcb4ad9f47bfb -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 8dc8551a200e8353a563828ccc8dcb4ad9f47bfb)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 818749241853f2f2cfb7dd704ee005a75a7356ba)
@@ -2280,7 +2280,7 @@
                 writtenRecordStatus = NVDATAMGMT_RECORD_NOT_CHECKED;
 
                 // Issue the write command
-                Fapi_issueProgrammingCommand( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
+                Fapi_issueProgrammingCommand ( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
             }
         }
     }
Index: PersistentAlarm.c
===================================================================
diff -u -r444d73f38662ecd425989d4457dea462a0b5c771 -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 444d73f38662ecd425989d4457dea462a0b5c771)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 818749241853f2f2cfb7dd704ee005a75a7356ba)
@@ -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.