Index: AlarmDefs.h =================================================================== diff -u -rbabb107766adb36b2e3fbfb80dc101678cf11ae8 -rf606f965d8d2e93c0eede2243b0ff56993177408 --- AlarmDefs.h (.../AlarmDefs.h) (revision babb107766adb36b2e3fbfb80dc101678cf11ae8) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f606f965d8d2e93c0eede2243b0ff56993177408) @@ -128,7 +128,7 @@ ALARM_ID_AVAILABLE_97 = 97, ///< Available alarms ALARM_ID_AVAILABLE_98 = 98, ///< Available alarms ALARM_ID_AVAILABLE_99 = 99, ///< Available alarms - // TD UI 30 + 1 Alarms and some reserved IDs from 100 to 130 + // Added 30 TD-UI Alarms +1 TD only from 100 to 130 with some reserved IDs ALARM_ID_TD_COMM_TIMEOUT = 100, ///< TD communication timeout ALARM_ID_UI_POST_FAILURE_OS_VERSION = 101, ///< UI POST OS version compatibility failure ALARM_ID_UI_POST_FAILURE_SHASUM = 102, ///< UI POST Application Integrity (Sha256Sum) failure @@ -174,7 +174,7 @@ ALARM_PRIORITY_HIGH = 3, ///< High priority alarm NUM_OF_ALARM_PRIORITIES ///< Total number of alarm priorities }; -typedef enum Alarm_Priorities ALARM_PRIORITY_T; ///< Type for alarm priorities enumeration +typedef enum Alarm_Priorities ALARM_PRIORITY_T; ///< Type for alarm priorities enumeration /// Alarm data types list. enum Alarm_Data_Types @@ -184,9 +184,9 @@ ALARM_DATA_TYPE_S32 = 2, ///< Alarm data is signed 32-bit integer type. ALARM_DATA_TYPE_F32 = 3, ///< Alarm data is 32-bit floating point type. ALARM_DATA_TYPE_BOOL = 4, ///< Alarm data is 32-bit boolean type. - NUM_OF_ALARM_DATA_TYPES ///< Total number of alarm data types. + NUM_OF_ALARM_DATA_TYPES ///< Total number of alarm data types. }; -typedef enum Alarm_Data_Types ALARM_DATA_TYPES_T; ///< Type for data type of triggered alarm. +typedef enum Alarm_Data_Types ALARM_DATA_TYPES_T; ///< Type for data type of triggered alarm. /// Enumeration of alarm sources. enum Alarm_Sources @@ -195,9 +195,9 @@ ALARM_SOURCE_TD = 1, ///< TD firmware alarm source ALARM_SOURCE_DD = 2, ///< DD firmware alarm source ALARM_SOURCE_RO = 3, ///< RO firmware alarm source - NUMBER_OF_ALARM_SOURCES ///< Number of alarm sources + NUMBER_OF_ALARM_SOURCES ///< Number of alarm sources }; -typedef enum Alarm_Sources ALARM_SOURCE_T; ///< Type for alarm sources enumeration +typedef enum Alarm_Sources ALARM_SOURCE_T; ///< Type for alarm sources enumeration /**@}*/ @@ -211,9 +211,9 @@ { ALARM_SILENCE_CMD_CANCEL = 0, ///< Cancel alarm silence command. ALARM_SILENCE_CMD_START = 1, ///< Start alarm silence command. - NUM_OF_ALARM_SILENCE_CMDS ///< Total number of alarm silence commands. + NUM_OF_ALARM_SILENCE_CMDS ///< Total number of alarm silence commands. }; -typedef enum Alarm_Silence_Commands ALARM_SILENCE_CMD_T; ///< Type for alarm silence commands +typedef enum Alarm_Silence_Commands ALARM_SILENCE_CMD_T; ///< Type for alarm silence commands /// Enumeration of alarm user actions. enum Alarm_User_Actions @@ -222,9 +222,9 @@ ALARM_USER_ACTION_RINSEBACK = 1, ///< User selected rinseback from alarm recovery options ALARM_USER_ACTION_END_TREATMENT = 2, ///< User selected end treatment from alarm recovery options ALARM_USER_ACTION_ACK = 3, ///< User selected acknowledge (ok) from alarm recovery options - NUMBER_OF_ALARM_USER_ACTIONS ///< Number of alarm user actions + NUMBER_OF_ALARM_USER_ACTIONS ///< Number of alarm user actions }; -typedef enum Alarm_User_Actions ALARM_USER_ACTION_T; ///< Type for alarm user actions enumeration +typedef enum Alarm_User_Actions ALARM_USER_ACTION_T; ///< Type for alarm user actions enumeration /// Enumeration of alarm state flags bit positions in periodic broadcast enum Alarm_State_Flag_Bit_Positions @@ -245,7 +245,7 @@ ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC = 13, ///< Dialysate recirculation is disabled ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE = 14, ///< Prevent user from minimizing alarm window ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION = 15, ///< The top alarm's condition is still being detected - NUM_OF_ALARM_STATE_FLAG_BIT_POS = 16, ///< The number of alarm state flag bit positions + NUM_OF_ALARM_STATE_FLAG_BIT_POS ///< The number of alarm state flag bit positions }; typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T;