Index: Common.h =================================================================== diff -u -rad710299295e009ed2c90b76b193bdd31814b216 -r96dd26e1af74ab9493cd708956cee42b19344be2 --- Common.h (.../Common.h) (revision ad710299295e009ed2c90b76b193bdd31814b216) +++ Common.h (.../Common.h) (revision 96dd26e1af74ab9493cd708956cee42b19344be2) @@ -143,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 ); \ } @@ -160,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 ); \ } @@ -171,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 ); \ }