Index: Utilities.h =================================================================== diff -u -r839935998cfe2a1a7594e6b6810301ad3c2aa872 -r5d0c8a999e953e1e4d644c4928b2e6ca4947e624 --- Utilities.h (.../Utilities.h) (revision 839935998cfe2a1a7594e6b6810301ad3c2aa872) +++ Utilities.h (.../Utilities.h) (revision 5d0c8a999e953e1e4d644c4928b2e6ca4947e624) @@ -7,8 +7,8 @@ * * @file Utilities.h * -* @author (last) Michael Garthwaite -* @date (last) 22-Feb-2022 +* @author (last) Dong Nguyen +* @date (last) 27-Sep-2022 * * @author (original) Sean * @date (original) 17-Feb-2020 @@ -39,7 +39,8 @@ 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_FPGA_UART_OVERRUN, ///< FPGA UART overrun error + TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, ///< FPGA clock speed error #ifdef _HD_ TIME_WINDOWED_COUNT_BP_COMMUTATION_ERROR, ///< Blood pump commutation error TIME_WINDOWED_COUNT_DIP_COMMUTATION_ERROR, ///< Dialysate inlet pump commutation error @@ -72,21 +73,21 @@ /// Record structure for alarm data of any supported type. typedef union { - U32 uInt; ///< critical data of unsigned integer type - S32 sInt; ///< critical data of signed integer type - F32 sFlt; ///< critical data of floating point type + U32 uInt; ///< critical data of unsigned integer type + S32 sInt; ///< critical data of signed integer type + F32 sFlt; ///< critical data of floating point type } CRITICAL_DATAS_T; /// critical integer data structure. typedef struct { - CRITICAL_DATA_TYPES_T typ; ///< Type of data - CRITICAL_DATAS_T minimum; ///< Minimum value for valid data - CRITICAL_DATAS_T maximum; ///< Maximum value for valid data - CRITICAL_DATAS_T defValue; ///< Default value - CRITICAL_DATAS_T data; ///< Data value - U32 comp; ///< One's compliment of value - BOOL set; ///< Flag indicates data has been set + CRITICAL_DATA_TYPES_T typ; ///< Type of data + CRITICAL_DATAS_T minimum; ///< Minimum value for valid data + CRITICAL_DATAS_T maximum; ///< Maximum value for valid data + CRITICAL_DATAS_T defValue; ///< Default value + CRITICAL_DATAS_T data; ///< Data value + U32 comp; ///< One's compliment of value + BOOL set; ///< Flag indicates data has been set } CRITICAL_DATA_T; // ********** public function prototypes ********** @@ -105,7 +106,7 @@ BOOL setCriticalData( CRITICAL_DATA_T *data, CRITICAL_DATAS_T value ); BOOL isCriticalDataInRange( CRITICAL_DATA_T *data ); void resetCriticalData( CRITICAL_DATA_T *data ); -U32 hexStrToDec( U08 const * const valuePtr, U08 size ); +BOOL hexStrToDec( U08 const * const valuePtr, U32* convValueAddress, U08 size ); BOOL isCriticalDataSet( CRITICAL_DATA_T *data ); ///< Determines if critical data has been set. void initSemaphores( void );