Index: Utilities.h =================================================================== diff -u -rcfd81ad59f6a5ccece4a3e0dc24c9601f7a13259 -rf2f982e98fcfee94ccb045f42091829c61df6262 --- Utilities.h (.../Utilities.h) (revision cfd81ad59f6a5ccece4a3e0dc24c9601f7a13259) +++ Utilities.h (.../Utilities.h) (revision f2f982e98fcfee94ccb045f42091829c61df6262) @@ -32,18 +32,22 @@ /// Enumeration of time-windowed counts. typedef enum TimeWindowedCounts { - TIME_WINDOWED_COUNT_BAD_MSG_CRC = 0, ///< Bad message CRC. - TIME_WINDOWED_COUNT_CAN_WARNING, ///< CAN warning. - TIME_WINDOWED_COUNT_CAN_PASSIVE, ///< CAN passive mode. - TIME_WINDOWED_COUNT_CAN_OFF, ///< CAN off. - TIME_WINDOWED_COUNT_CAN_PARITY, ///< CAN parity error. - TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR, ///< FPGA UART frame error. - TIME_WINDOWED_COUNT_FPGA_UART_OVERRUN, ///< FPGA UART overrun error. + TIME_WINDOWED_COUNT_BAD_MSG_CRC = 0, ///< Bad message CRC. + TIME_WINDOWED_COUNT_CAN_WARNING, ///< CAN warning. + TIME_WINDOWED_COUNT_CAN_PASSIVE, ///< CAN passive mode. + TIME_WINDOWED_COUNT_CAN_OFF, ///< CAN off. + TIME_WINDOWED_COUNT_CAN_PARITY, ///< CAN parity error. + TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR, ///< FPGA UART frame error. + TIME_WINDOWED_COUNT_FPGA_UART_OVERRUN, ///< FPGA UART overrun error. #ifdef _HD_ #endif #ifdef _DG_ + TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, ///< FPGA Conductivity sensor error #endif - NUM_OF_TIME_WINDOWED_COUNTS ///< Number of pressure sensors. +#ifdef _VECTORCAST_ + TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, ///< FPGA Conductivity sensor error +#endif + NUM_OF_TIME_WINDOWED_COUNTS ///< Number of pressure sensors. } TIME_WINDOWED_COUNT_T; // ********** public function prototypes **********