Index: Common.h =================================================================== diff -u -rbc8c16be27e3e75817e71d43681b51adf8b40ae8 -r87837a30c01ccd74d05bb77c734cbbc25a045202 --- Common.h (.../Common.h) (revision bc8c16be27e3e75817e71d43681b51adf8b40ae8) +++ Common.h (.../Common.h) (revision 87837a30c01ccd74d05bb77c734cbbc25a045202) @@ -8,7 +8,7 @@ * @file Common.h * * @author (last) Dara Navaei -* @date (last) 21-May-2022 +* @date (last) 03-Aug-2022 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -34,6 +34,7 @@ typedef float F32; ///< 32-bit floating point type typedef double F64; ///< 64-bit floating point type +typedef long long S64; ///< 64-bit signed 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 @@ -120,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 **** @@ -253,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_