Index: AlarmDefs.h =================================================================== diff -u -r324ee2e34f5eb3a6071d13d20b850b6213c4d5fe -ra939fd0358c96b2bbd880705518b5f40be104888 --- AlarmDefs.h (.../AlarmDefs.h) (revision 324ee2e34f5eb3a6071d13d20b850b6213c4d5fe) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a939fd0358c96b2bbd880705518b5f40be104888) @@ -155,6 +155,7 @@ ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117, ///< HD prime completed low priority alarm ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118, ///< HD prime completed medium priority alarm ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119, ///< HD prime completed high priority alarm + ALARM_ID_PRIME_OUT_OF_TIME = 120, ///< HD prime out of time alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -365,6 +366,7 @@ { ALARM_PRIORITY_LOW, 25, ALM_ESC_90_MIN, ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY { ALARM_PRIORITY_MEDIUM, 4, ALM_ESC_30_MIN, ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY + { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_PRIME_OUT_OF_TIME // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew UsrAck }; Index: DGDefs.h =================================================================== diff -u -r8439ed29c90fdbdd61928a03d56efc3e4d3f3429 -ra939fd0358c96b2bbd880705518b5f40be104888 --- DGDefs.h (.../DGDefs.h) (revision 8439ed29c90fdbdd61928a03d56efc3e4d3f3429) +++ DGDefs.h (.../DGDefs.h) (revision a939fd0358c96b2bbd880705518b5f40be104888) @@ -249,7 +249,7 @@ enum DG_Service_States { DG_SERVICE_STATE_START = 0, ///< Start service mode state - NUM_OF_DG_SERVICE_STATES ///< Number of service mode statesS + NUM_OF_DG_SERVICE_STATES ///< Number of service mode states }; typedef enum DG_Service_States DG_SERVICE_STATE_T; ///< Type for DG service states enumeration Index: MsgDefs.h =================================================================== diff -u -r43bcdbff752f578fe33ff30ec5cf912454a1b685 -ra939fd0358c96b2bbd880705518b5f40be104888 --- MsgDefs.h (.../MsgDefs.h) (revision 43bcdbff752f578fe33ff30ec5cf912454a1b685) +++ MsgDefs.h (.../MsgDefs.h) (revision a939fd0358c96b2bbd880705518b5f40be104888) @@ -95,7 +95,7 @@ MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41, ///< HD response to user request to pause or resume ultrafiltration MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42, ///< DG broadcast of concentrate pump data - MSG_ID_DG_PRIMING_STATUS_DATA = 0x43, ///< HD priming status during cartridge prime + MSG_ID_HD_PRIMING_STATUS_DATA = 0x43, ///< HD priming status during cartridge prime MSG_ID_DG_UV_REACTORS_DATA = 0x44, ///< DG broadcast UV reactors data MSG_ID_DG_THERMISTORS_DATA = 0x45, ///< DG broadcast thermistors data MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46, ///< UI request to change pressure limits @@ -109,6 +109,7 @@ MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0x4E, ///< UI command to set alarm audio volume level MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F, ///< UI request to validate new ultrafiltration volume treatment parameter MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50, ///< HD response to new treatment parameters set + MSG_ID_DG_COMMAND_RESPONSE = 0x51, ///< DG response to command from HD #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -266,6 +267,16 @@ }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration +/// Enumeration of command request rejection reason codes +enum Cmd_Request_Reject_Reasons +{ + CMD_REQUEST_REJECT_REASON_NONE = 0, ///< Used when there is no rejection + CMD_REQUEST_REJECT_REASON_INVALID_MODE = 1, ///< Command is not allowed in the current operating mode + CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER = 2, ///< Command parameter is not valid + NUM_OF_CMD_REQUEST_REJECT_REASONS ///< Number of command request reject codes +}; +typedef enum Cmd_Request_Reject_Reasons CMD_REQUEST_REJECT_REASON_CODE_T; ///< Type for command request rejection reason codes enumeration + /**@}*/ #endif