Index: AlarmDefs.h =================================================================== diff -u -r23c6a623afe7b16729d3ebe15e492b7332381bcd -r706ed832e173f9691ee4a7350bce95cd606b183d --- AlarmDefs.h (.../AlarmDefs.h) (revision 23c6a623afe7b16729d3ebe15e492b7332381bcd) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 706ed832e173f9691ee4a7350bce95cd606b183d) @@ -230,6 +230,8 @@ ALARM_ID_TD_PRIME_COMPLETED_MEDIUM = 198, ///< TD prime completed medium priority alarm ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS = 199, ///< TD repeated air trap lower events ALARM_ID_TD_TUBE_SET_MISMATCH = 200, ///< TD tubeset mismatch alarm + ALARM_ID_TD_HDF_SUBMODE_CHANGE = 201, ///< TD hdf submode change alarm ( pre-dilution/post-dilution ) + ALARM_ID_TD_TREATMENT_MODALITY_CHANGE = 202, ///< TD treatment modality change alarm ( HD <-> HDF ) NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -605,6 +607,8 @@ { ALARM_PRIORITY_MEDIUM, 590, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_TD_PRIME_COMPLETED_MEDIUM }, { ALARM_PRIORITY_HIGH, 17, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS }, { ALARM_PRIORITY_MEDIUM, 300, ALM_SRC_TD, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBE_SET_MISMATCH }, + { ALARM_PRIORITY_MEDIUM, 301, ALM_SRC_TD, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_HDF_SUBMODE_CHANGE }, + { ALARM_PRIORITY_MEDIUM, 301, ALM_SRC_TD, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TREATMENT_MODALITY_CHANGE }, }; // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -772,6 +776,8 @@ { 292, ALARM_ID_TD_BLOOD_PRIME_PAUSE_WARNING }, { 300, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER }, { 300, ALARM_ID_TD_TUBE_SET_MISMATCH }, + { 301, ALARM_ID_TD_TREATMENT_MODALITY_CHANGE }, + { 301, ALARM_ID_TD_HDF_SUBMODE_CHANGE }, { 401, ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP }, { 401, ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, { 402, ALARM_ID_DD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, @@ -1041,6 +1047,8 @@ { 198 , ALARM_ID_TD_PRIME_COMPLETED_MEDIUM , "TD | Prime Complete - 30 MIN WARNING | The priming process completed 90 minutes ago. \n- Treatment must begin within 30 minutes or the\npre-treatment process will be terminated.\n- Press Resume/OK to continue. | Process: Pre-Tx Prime Complete | TD prime completed medium priority alarm | In Pre-Treatment Recirculation for 90 minutes | "}, { 199 , ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS , "TD | Blood Pump Stopped: Venous Air Detector | The air trap level required repeated lowering events. \n- Confirm blood tubing connections are secure.\n- Inspect the air trap for abnormal fluid levels. \n- Resume treatment if the condition has been corrected. | Blood Stop: Repeated Air Trap Lower | Repeated air trap lower events detected during treatment | If 5 air trap lower events occur within 5 minutes during treatment. | "}, { 200 , ALARM_ID_TD_TUBE_SET_MISMATCH , "TD | Wrong Tube Set Installed | The installed tube set does not match the selected treatment type. \n- Remove the current tube set.\n- Install the correct tube set for the selected treatment:\n HD or HD with Online Fluid requires an HD tube set.\n HDF requires an HDF tube set. | TD Tube Set Mismatch | TD installed tube set type does not match the selected treatment modality | If the scanned tube set type does not match the tube set type required for the selected treatment modality. | "}, + { 201 , ALARM_ID_TD_HDF_SUBMODE_CHANGE , "TD | HDF Submode Change | HDF treatment mode has changed. \n- Switch substitution delivery port to correct dilution mode. \n | TD HDF Mode Change | TD has been requested to change HDF treatment mode | User has requested to change HDF Treatment mode | "}, + { 202 , ALARM_ID_TD_TREATMENT_MODALITY_CHANGE , "TD | Treatment Modality Change | Treatment modality has changed. \n- Remove the current tube set.\n- Install the correct tube set for the selected treatment:\n HD or HD with Online Fluid requires an HD tube set.\n HDF requires an HDF tube set. | TD Treatment Modality Change | TD has been requested to change treatment modality | User has requested to change treament modality | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r1e879d0eb4a72396680e198d8b77393ca0e06921 -r706ed832e173f9691ee4a7350bce95cd606b183d --- MsgDefs.h (.../MsgDefs.h) (revision 1e879d0eb4a72396680e198d8b77393ca0e06921) +++ MsgDefs.h (.../MsgDefs.h) (revision 706ed832e173f9691ee4a7350bce95cd606b183d) @@ -215,14 +215,21 @@ MSG_ID_AVAILABLE_B7 = 0xB7, ///< Msg ID not used - available for use. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response - MSG_ID_TD_HEMODIAFILTRATION_DATA = 0xBA, ///< TD Hemodiafiltration data + MSG_ID_TD_HEMODIAFILTRATION_DATA = 0xBC, ///< TD Hemodiafiltration data + MSG_ID_UI_PAUSE_SUB_FLOW_REQUEST = 0xBD, ///< UI pause substitution flow request + MSG_ID_TD_PAUSE_SUB_FLOW_RESPONSE = 0xBE, ///< TD pause substitution flow response + MSG_ID_UI_AUTO_SUBSTITUTION_REQUEST = 0xBF, ///< UI auto substitution flow request + MSG_ID_TD_AUTO_SUBSTITUTION_REPONSE = 0xC0, ///< TD auto substitution flow response + MSG_ID_UI_HDF_ADJUSTMENT_REQUEST = 0xC1, ///< UI HDF adjustment request + MSG_ID_TD_HDF_ADJUSTMENT_RESPONSE = 0xC2, ///< TD HDF adjustment response MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB, ///< DD substitution pump broadcast data. MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC, ///< DD conductivity resistance data broadcast. MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD, ///< FP Filter Flush broadcast data MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE, ///< FP Permeate Flush broadcast data + // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE, ///< TD tester log-in