Index: Utilities.h =================================================================== diff -u -r5d0c8a999e953e1e4d644c4928b2e6ca4947e624 -r80ad1af00243aca326afb85dd81dfe7302400d81 --- Utilities.h (.../Utilities.h) (revision 5d0c8a999e953e1e4d644c4928b2e6ca4947e624) +++ Utilities.h (.../Utilities.h) (revision 80ad1af00243aca326afb85dd81dfe7302400d81) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Utilities.h * -* @author (last) Dong Nguyen -* @date (last) 27-Sep-2022 +* @author (last) Bill Bracken +* @date (last) 14-May-2023 * * @author (original) Sean * @date (original) 17-Feb-2020 @@ -29,7 +29,7 @@ // ********** public definitions ********** // ******* Time Windowed Count Definitions ********* -#define MAX_TIME_WINDOWED_COUNT 5 ///< Maximum number of counts that a time windowed count can count to +#define MAX_TIME_WINDOWED_COUNT 10 ///< Maximum number of counts that a time windowed count can count to /// Enumeration of time-windowed counts. typedef enum TimeWindowedCounts @@ -38,17 +38,18 @@ TIME_WINDOWED_COUNT_CAN_WARNING, ///< CAN warning 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_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 TIME_WINDOWED_COUNT_DOP_COMMUTATION_ERROR, ///< Dialysate outlet pump commutation error + TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, ///< Syringe pump off movement error + TIME_WINDOWED_COUNT_BATT_COMM_ERROR, ///< Battery communication error #endif #ifdef _DG_ TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, ///< FPGA Conductivity sensor error TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR, ///< FPGA Temperature sensor error + TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, ///< FPGA communication failure (NAK, CRC, timeout) #endif NUM_OF_TIME_WINDOWED_COUNTS ///< Number of pressure sensors } TIME_WINDOWED_COUNT_T; @@ -112,7 +113,7 @@ void initSemaphores( void ); BOOL getSemaphore( SEMAPHORE_T s ); void releaseSemaphore( SEMAPHORE_T s ); -BOOL isSemaphoreReleased( SEMAPHORE_T s ); +BOOL isSemaphoreReleased( SEMAPHORE_T s ); /**@}*/