Index: HDDefs.h =================================================================== diff -u -re5949d8218a7aa83bfba1a9ddc4458f1e34ba78d -r79282b9e48ca094e682e4185569ecc075dcd3f40 --- HDDefs.h (.../HDDefs.h) (revision e5949d8218a7aa83bfba1a9ddc4458f1e34ba78d) +++ HDDefs.h (.../HDDefs.h) (revision 79282b9e48ca094e682e4185569ecc075dcd3f40) @@ -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,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 -r1a612ed89df0ad8fcfc3c6c2615794d5bc2920a7 -r79282b9e48ca094e682e4185569ecc075dcd3f40 --- MsgDefs.h (.../MsgDefs.h) (revision 1a612ed89df0ad8fcfc3c6c2615794d5bc2920a7) +++ MsgDefs.h (.../MsgDefs.h) (revision 79282b9e48ca094e682e4185569ecc075dcd3f40) @@ -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