Index: Common.h =================================================================== diff -u -rc4171147708d867ba5886aaa53182ad0fae774d3 -r4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe --- Common.h (.../Common.h) (revision c4171147708d867ba5886aaa53182ad0fae774d3) +++ Common.h (.../Common.h) (revision 4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe) @@ -34,7 +34,7 @@ typedef float F32; ///< 32-bit floating point type typedef double F64; ///< 64-bit floating point type -typedef long long U64; ///< 64-bit signed integer type +typedef unsigned long long U64; ///< 64-bit unsigned integer type typedef unsigned int U32; ///< 32-bit unsigned integer type typedef int S32; ///< 32-bit signed integer type typedef unsigned short U16; ///< 16-bit unsigned integer type @@ -121,6 +121,7 @@ #define BITS_12_FULL_SCALE 4096 ///< Full scale range for 12 bit ADC or DAC #define BITS_14_FULL_SCALE 16384 ///< Full scale range for 14 bit ADC or DAC #define BITS_16_FULL_SCALE 65536 ///< Full scale range for 16 bit ADC or DAC +#define BITS_24_FULL_SCALE 16777216 ///< Full scale range for 24 bit ADC or DAC #define HALF 0.5F ///< Half // **** Common Macros **** @@ -254,6 +255,23 @@ sendEvent( e, dat1, dat2 ); \ } +// **** Common Broadcast Data **** + +/// Heaters data structure. +typedef struct +{ + F32 mainPrimayHeaterDC; ///< Main primary heater DC + F32 smallPrimaryHeaterDC; ///< Small primary heater DC + F32 trimmerHeaterDC; ///< Trimmer heater DC + F32 primaryTargetTemp; ///< Primary heater target temperature + F32 trimmerTargetTemp; ///< Trimmer heater target temperature + U32 primaryHeaterState; ///< Primary heater state + U32 trimmerHeaterState; ///< Trimmer heater state + F32 primaryEfficiency; ///< Primary heater efficiency + F32 primaryCalcTargetTemp; ///< Primary heater calculated target temperature + F32 trimmerCalcCurrentTemp; ///< Trimmer heater calculated current temperature +} HEATERS_DATA_T; + // **** VectorCAST Definitions **** #ifdef _VECTORCAST_