Index: Common.h
===================================================================
diff -u -rbf2d6475e56347bca120d709c37f16d0f781f944 -r818749241853f2f2cfb7dd704ee005a75a7356ba
--- Common.h	(.../Common.h)	(revision bf2d6475e56347bca120d709c37f16d0f781f944)
+++ 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.
@@ -85,6 +85,7 @@
 
 // **** Common Definitions ****
 
+#define NEARLY_INFINITY                 1.0E20      ///< Value that is nearly infinity.
 #define NEARLY_ZERO                     0.00000001  ///< Value that is nearly zero.  Used for floating point zero comparisons (e.g. divide by zero checks)
 #define HEX_64_K                        0x10000     ///< 64K (65536 in decimal)
 #define HEX_32_BIT_FULL_SCALE           0xFFFFFFFF  ///< 32-bit full scale value
@@ -142,15 +143,15 @@
 /// Macro to set a specific alarm with 1 piece of unsigned 32-bit alarm data.
 #define SET_ALARM_WITH_1_U32_DATA(a,d1)   { \
     ALARM_DATA_T dat1; \
-    dat1.dataType = ALARM_DATA_TYPE_U32; \
+    dat1.dataType = (U32)ALARM_DATA_TYPE_U32; \
     dat1.data.uInt.data = (U32)(d1); \
     activateAlarm1Data( a, dat1 ); \
 }
 
 /// Macro to set a specific alarm with 1 piece of floating point alarm data.
 #define SET_ALARM_WITH_1_F32_DATA(a,d1)   { \
     ALARM_DATA_T dat1; \
-    dat1.dataType = ALARM_DATA_TYPE_F32; \
+    dat1.dataType = (U32)ALARM_DATA_TYPE_F32; \
     dat1.data.flt.data = (F32)(d1); \
     activateAlarm1Data( a, dat1 ); \
 }
@@ -159,9 +160,9 @@
 #define SET_ALARM_WITH_2_U32_DATA(a,d1,d2)   { \
     ALARM_DATA_T dat1; \
     ALARM_DATA_T dat2; \
-    dat1.dataType = ALARM_DATA_TYPE_U32; \
+    dat1.dataType = (U32)ALARM_DATA_TYPE_U32; \
     dat1.data.uInt.data = (U32)(d1); \
-    dat2.dataType = ALARM_DATA_TYPE_U32; \
+    dat2.dataType = (U32)ALARM_DATA_TYPE_U32; \
     dat2.data.uInt.data = (U32)(d2); \
     activateAlarm2Data( a, dat1, dat2 ); \
 }
@@ -170,9 +171,9 @@
 #define SET_ALARM_WITH_2_F32_DATA(a,d1,d2)   { \
     ALARM_DATA_T dat1; \
     ALARM_DATA_T dat2; \
-    dat1.dataType = ALARM_DATA_TYPE_F32; \
+    dat1.dataType = (U32)ALARM_DATA_TYPE_F32; \
     dat1.data.flt.data = (F32)(d1); \
-    dat2.dataType = ALARM_DATA_TYPE_F32; \
+    dat2.dataType = (U32)ALARM_DATA_TYPE_F32; \
     dat2.data.flt.data = (F32)(d2); \
     activateAlarm2Data( a, dat1, dat2 ); \
 }