Index: AlarmDefs.h =================================================================== diff -u -r6d67a5af1c17911281c2a4c16e6623e38857d5cc -r7cc57a0833e0eb1076b6c335080afa94398998f1 --- AlarmDefs.h (.../AlarmDefs.h) (revision 6d67a5af1c17911281c2a4c16e6623e38857d5cc) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 7cc57a0833e0eb1076b6c335080afa94398998f1) @@ -341,6 +341,7 @@ ALARM_ID__AVAILABLE_4 = 303, ///< Alarm ID available for use ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record ALARM_ID_HD_CPU_RAM_ERROR = 305, ///< HD processor RAM error + ALARM_ID_HD_AIR_TRAP_OVERFILL = 306, NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -776,7 +777,8 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM } + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_AIR_TRAP_OVERFILL, 0, ALARM_ID_NO_ALARM } }; // Priority Rank Fault DFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -993,6 +995,7 @@ { 3, ALARM_ID_HD_INVALID_SERIAL_NUMBER }, { 3, ALARM_ID_DG_CPU_RAM_ERROR }, { 3, ALARM_ID_HD_CPU_RAM_ERROR }, + { 3, ALARM_ID_HD_AIR_TRAP_OVERFILL }, { 3, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, Index: HDDefs.h =================================================================== diff -u -r1c36cebf96d87d24e09b7219919d0cdf34b4528d -r7cc57a0833e0eb1076b6c335080afa94398998f1 --- HDDefs.h (.../HDDefs.h) (revision 1c36cebf96d87d24e09b7219919d0cdf34b4528d) +++ HDDefs.h (.../HDDefs.h) (revision 7cc57a0833e0eb1076b6c335080afa94398998f1) @@ -745,21 +745,14 @@ }; typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration -/**@}*/ - -/** - * @addtogroup UIUserConfirm - * @{ - */ - -/// Enumeration of generic confirmation. +/// Enumeration of generic confirmation request type from HD to UI. enum Generic_Confirm_Command { GENERIC_CONFIRM_CMD_REQUEST_OPEN = 0, ///< Generic Confirm command to display the confirmation GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE = 1, ///< Generic Confirm command to hide the confirmation, due to timeout user confirmation GENERIC_CONFIRM_CMD_REJECT = 2, ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore. GENERIC_CONFIRM_CMD_ACCEPT_CLOSE = 3, ///< Generic Confirm command to hide the confirmation, due to accept user confirmation. - NUM_OF_GENERIC_CONFIRM_COMMAND , ///< Total number of generic confirm commands + NUM_OF_GENERIC_CONFIRM_COMMAND ///< Total number of generic confirm commands }; typedef enum Generic_Confirm_Command GENERIC_CONFIRM_COMMAND_T; ///< Type for generic confirm enumeration @@ -770,7 +763,7 @@ * @{ */ -/// Enumeration of generic confirmation. +/// Enumeration of generic confirmation id between HD and UI. enum Generic_Confirm_Id { GENERIC_CONFIRM_ID_NONE = 0, ///< Generic Confirm None @@ -783,4 +776,15 @@ /**@}*/ +/// List of confirmation request status +typedef enum Confirmation_Status +{ + CONFIRMATION_REQUEST_STATUS_REJECTED = 0, ///< Confirmation status rejected + CONFIRMATION_REQUEST_STATUS_ACCEPTED, ///< Confirmation status accepted + CONFIRMATION_REQUEST_STATUS_TIMEOUT, ///< Confirmation status timeout + CONFIRMATION_REQUEST_STATUS_PENDING, ///< Confirmation status pending response + CONFIRMATION_REQUEST_STATUS_UNUSED, ///< Confirmation status Unused + NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status +} CONFIRMATION_REQUEST_STATUS_T; + #endif Index: MsgDefs.h =================================================================== diff -u -r1c36cebf96d87d24e09b7219919d0cdf34b4528d -r7cc57a0833e0eb1076b6c335080afa94398998f1 --- MsgDefs.h (.../MsgDefs.h) (revision 1c36cebf96d87d24e09b7219919d0cdf34b4528d) +++ MsgDefs.h (.../MsgDefs.h) (revision 7cc57a0833e0eb1076b6c335080afa94398998f1) @@ -215,6 +215,10 @@ MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9, ///< HD request DG service record + MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA, ///< HD request UI confirmation + MSG_ID_UI_CONFIRMATION_RESULT = 0xBB, ///< UI confirmation result response + MSG_ID_REQUEST_DG_CPLD_STATUS = 0xBC, ///< Dialin request for DG CPLD Status + MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing