Index: Common.h =================================================================== diff -u -r1eb896aac1f2d3ab20bf8c1a2a8e751b8df6a740 -r0c642278db89817a77d6b36235661fad02af1902 --- Common.h (.../Common.h) (revision 1eb896aac1f2d3ab20bf8c1a2a8e751b8df6a740) +++ Common.h (.../Common.h) (revision 0c642278db89817a77d6b36235661fad02af1902) @@ -177,6 +177,7 @@ activateAlarm2Data( a, dat1, dat2 ); \ } +#pragma pack(push,1) /// Record structure for unsigned integer event data. typedef struct { @@ -227,14 +228,15 @@ EVENT_DATA_TYPES_T dataType; ///< The type of event data provided. EVENT_DATAS_T data; ///< The event data of specified type. } EVENT_DATA_T; +#pragma pack(pop) /// Macro to set a specific alarm with 2 pieces of unsigned 32-bit alarm data. #define SEND_EVENT_WITH_2_U32_DATA(e,d1,d2) { \ EVENT_DATA_T dat1; \ EVENT_DATA_T dat2; \ - dat1.dataType = EVENT_DATA_TYPE_U32; \ + dat1.dataType = (U32)(EVENT_DATA_TYPE_U32); \ dat1.data.uInt.data = (U32)(d1); \ - dat2.dataType = EVENT_DATA_TYPE_U32; \ + dat2.dataType = (U32)(EVENT_DATA_TYPE_U32); \ dat2.data.uInt.data = (U32)(d2); \ sendEvent( e, dat1, dat2 ); \ } @@ -243,9 +245,9 @@ #define SEND_EVENT_WITH_2_F32_DATA(e,d1,d2) { \ EVENT_DATA_T dat1; \ EVENT_DATA_T dat2; \ - dat1.dataType = EVENT_DATA_TYPE_F32; \ + dat1.dataType = (U32)(EVENT_DATA_TYPE_F32); \ dat1.data.flt.data = (F32)(d1); \ - dat2.dataType = EVENT_DATA_TYPE_F32; \ + dat2.dataType = (U32)(EVENT_DATA_TYPE_F32); \ dat2.data.flt.data = (F32)(d2); \ sendEvent( e, dat1, dat2 ); \ }