Index: Common.h =================================================================== diff -u -r5d5379919444bde611582749e1c1d1ec6fdc6bfe -r7af12502ddbf9528ce1a8088c42690a0d4385952 --- Common.h (.../Common.h) (revision 5d5379919444bde611582749e1c1d1ec6fdc6bfe) +++ Common.h (.../Common.h) (revision 7af12502ddbf9528ce1a8088c42690a0d4385952) @@ -23,19 +23,20 @@ #ifndef _VECTORCAST_ // #define RM46_EVAL_BOARD_TARGET 1 +// #define BREADBOARD2_TARGET 1 // #define SIMULATE_UI 1 - #define DEBUG_ENABLED 1 +// #define DEBUG_ENABLED 1 // #define DISABLE_CRC_ERROR 1 // #define DISABLE_MOTOR_CURRENT_ERRORS 1 - #define SHOW_RAW_FLOW_VALUES 1 +// #define SHOW_RAW_FLOW_VALUES 1 // #define CAN_TEST 1 #ifdef DEBUG_ENABLED #include #include #endif #endif -#define UF_TEST_ENABLED 1 +//#define UF_TEST_ENABLED 1 /** * @defgroup CommonHeader CommonHeader @@ -152,7 +153,7 @@ activateAlarm1Data( a, dat1 ); \ } -/// Macro to set a specific alarm with 1 piece of unsigned floating point alarm data. +/// 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; \ @@ -171,6 +172,17 @@ activateAlarm2Data( a, dat1, dat2 ); \ } +/// Macro to set a specific alarm with 2 pieces of floating point alarm data. +#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.data.flt.data = (F32)(d1); \ + dat2.dataType = ALARM_DATA_TYPE_F32; \ + dat2.data.flt.data = (F32)(d2); \ + activateAlarm2Data( a, dat1, dat2 ); \ +} + // **** VectorCAST Definitions **** #ifdef _VECTORCAST_