Index: AlarmDefs.h =================================================================== diff -u -r6efdeec69882f8fdb1511f388e7143bc80952f3b -r0657fa8a775807ba204aa05b2df0ebe4cf54b154 --- AlarmDefs.h (.../AlarmDefs.h) (revision 6efdeec69882f8fdb1511f388e7143bc80952f3b) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 0657fa8a775807ba204aa05b2df0ebe4cf54b154) @@ -169,6 +169,7 @@ ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131, ///< HD rinseback volume check failure ALARM_ID_NO_CARTRIDGE_LOADED = 132, ///< HD no cartridge loaded alarm ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 133, ///< HD end treatment sub-mode timeout alarm + ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134, ///< HD blood prime volume check failure NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -402,6 +403,7 @@ { ALARM_PRIORITY_MEDIUM, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED { ALARM_PRIORITY_MEDIUM, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_END_TREATMENT_TIMEOUT_ALARM + { ALARM_PRIORITY_MEDIUM, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew UsrAck }; Index: HDDefs.h =================================================================== diff -u -r6efdeec69882f8fdb1511f388e7143bc80952f3b -r0657fa8a775807ba204aa05b2df0ebe4cf54b154 --- HDDefs.h (.../HDDefs.h) (revision 6efdeec69882f8fdb1511f388e7143bc80952f3b) +++ HDDefs.h (.../HDDefs.h) (revision 0657fa8a775807ba204aa05b2df0ebe4cf54b154) @@ -317,6 +317,24 @@ /**@}*/ /** + * @addtogroup BloodPrime + * @{ + */ + +/// Enumeration of blood prime sub-mode states. +enum Blood_Prime_States +{ + BLOOD_PRIME_RAMP_STATE = 0, ///< Ramp state of the blood prime sub-mode state machine + NUM_OF_BLOOD_PRIME_STATES ///< Number of blood prime sub-mode states +}; +/// Type for treatment end states enumeration. +typedef enum Blood_Prime_States BLOOD_PRIME_STATE_T; + +/**@}*/ + +/**@}*/ + +/** * @addtogroup Rinseback * @{ */ Index: MsgDefs.h =================================================================== diff -u -r7c54b9e5c72171583dd081fe81288fa7a39dea1c -r0657fa8a775807ba204aa05b2df0ebe4cf54b154 --- MsgDefs.h (.../MsgDefs.h) (revision 7c54b9e5c72171583dd081fe81288fa7a39dea1c) +++ MsgDefs.h (.../MsgDefs.h) (revision 0657fa8a775807ba204aa05b2df0ebe4cf54b154) @@ -117,6 +117,7 @@ MSG_ID_HD_RINSEBACK_PROGRESS = 0x56, ///< HD broadcast of rinseback progress MSG_ID_UI_TX_END_CMD = 0x57, ///< UI end treatment sub-mode user request MSG_ID_HD_TX_END_CMD_RESPONSE = 0x58, ///< HD end treatment sub-mode user request response + MSG_ID_HD_BLOOD_PRIME_PROGRESS = 0x59, ///< HD broadcast of blood prime progress #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing