Index: AlarmDefs.h =================================================================== diff -u -r6d67a5af1c17911281c2a4c16e6623e38857d5cc -rbb8318dec093411e13758f37c26e0d815010d8eb --- AlarmDefs.h (.../AlarmDefs.h) (revision 6d67a5af1c17911281c2a4c16e6623e38857d5cc) +++ AlarmDefs.h (.../AlarmDefs.h) (revision bb8318dec093411e13758f37c26e0d815010d8eb) @@ -341,6 +341,8 @@ 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, ///< HD air trap over-fill alarm + ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT = 307, ///< HD AC power lost second alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -776,7 +778,9 @@ { 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 }, + { ALARM_PRIORITY_HIGH, 18, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT, 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. @@ -995,6 +999,7 @@ { 3, ALARM_ID_HD_CPU_RAM_ERROR }, { 3, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT }, + { 3, ALARM_ID_HD_AIR_TRAP_OVERFILL }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1011,6 +1016,7 @@ { 17, ALARM_ID_HD_EXCESSIVE_TILT }, { 17, ALARM_ID_DG_EXCESSIVE_TILT }, { 18, ALARM_ID_HD_AC_POWER_LOST }, + { 18, ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT }, { 19, ALARM_ID_DG_COMM_TIMEOUT }, { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, Index: HDDefs.h =================================================================== diff -u -re5949d8218a7aa83bfba1a9ddc4458f1e34ba78d -rbb8318dec093411e13758f37c26e0d815010d8eb --- HDDefs.h (.../HDDefs.h) (revision e5949d8218a7aa83bfba1a9ddc4458f1e34ba78d) +++ HDDefs.h (.../HDDefs.h) (revision bb8318dec093411e13758f37c26e0d815010d8eb) @@ -7,8 +7,8 @@ * * @file HDDefs.h * -* @author (last) Behrouz NematiPour -* @date (last) 04-Oct-2022 +* @author (last) Dara Navaei +* @date (last) 18-Oct-2022 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -744,21 +744,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 @@ -769,7 +762,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 @@ -782,4 +775,17 @@ /**@}*/ +/// 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 -r1a612ed89df0ad8fcfc3c6c2615794d5bc2920a7 -rbb8318dec093411e13758f37c26e0d815010d8eb --- MsgDefs.h (.../MsgDefs.h) (revision 1a612ed89df0ad8fcfc3c6c2615794d5bc2920a7) +++ MsgDefs.h (.../MsgDefs.h) (revision bb8318dec093411e13758f37c26e0d815010d8eb) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Sean Nash -* @date (last) 26-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 18-Oct-2022 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -215,6 +215,12 @@ 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_CPLD_STATUS = 0xBC, ///< Dialin request for CPLD Status + MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status + MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE, ///< HD battery management logging data + MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF, ///< HD battery status logging data #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -321,7 +327,7 @@ MSG_ID____AVAILABLE_2 = 0x8061, ///< Unused - this message ID is available for use MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062, ///< HD switches status override request MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request - MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request + MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE = 0x8064, ///< HD battery remaining capacity (in mWh) override request MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE = 0x8065, ///< HD temperatures value override request MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0x8066, ///< HD temperatures data publish override request MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0x8067, ///< HD fans data publish override request