Index: AlarmDefs.h =================================================================== diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r3b43acb32a0253d05fd98e65cdcb5e7fb7a41870 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3b43acb32a0253d05fd98e65cdcb5e7fb7a41870) @@ -226,6 +226,7 @@ ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED = 194, ///< TD integrity post test fault ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED = 195, ///< TD integrity post test fault ALARM_ID_TD_EMPTY_SALINE_BAG = 196, ///< TD empty saline bag alarm + ALARM_ID_TD_TUBE_SET_MISMATCH = 197, ///< TD tubeset mismatch alarm NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -570,6 +571,7 @@ { ALARM_PRIORITY_HIGH, 1, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 1, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 202, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_EMPTY_SALINE_BAG }, + { 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 }, }; // 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. @@ -734,6 +736,7 @@ { 291, ALARM_ID_TD_BLOOD_PRIME_PAUSE_TIMEOUT }, { 292, ALARM_ID_TD_BLOOD_PRIME_PAUSE_WARNING }, { 300, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER }, + { 300, ALARM_ID_TD_TUBE_SET_MISMATCH }, { 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 }, @@ -998,6 +1001,7 @@ { 194 , ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED , "TD | Service Required: Hemodialysis Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Firmware Image Integrity Failure | TD firmware image integrity POST test failed | If the calculated CRC of the TD image does not match the expected CRC. | "}, { 195 , ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED , "DD | Service Required: Hemodialysis Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Firmware Image Integrity Failure | DD firmware image integrity POST test failed | If the calculated CRC of the DD image does not match the expected CRC. | "}, { 196 , ALARM_ID_TD_EMPTY_SALINE_BAG , "TD | Blood Pump Stopped: Saline Bag Empty | The saline bag appears empty.\n- Check the saline bag and replace if empty. | Blood Stop: Saline Bag Empty | TD Saline bag is empty | If the measured arterial pressure < -300.0 mmHg for more than 250 msec. | "}, + { 197, 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. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r3b43acb32a0253d05fd98e65cdcb5e7fb7a41870 --- MsgDefs.h (.../MsgDefs.h) (revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60) +++ MsgDefs.h (.../MsgDefs.h) (revision 3b43acb32a0253d05fd98e65cdcb5e7fb7a41870) @@ -564,6 +564,7 @@ REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED = 58, ///< Confirmation received without prior validation REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH = 59, ///< Confirmed value does not match validated value REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE = 60, ///< Request is not allowed in current treatment sub-state + REQUEST_REJECT_REASON_MODALITY_MISMATCH = 61, ///< Mismatched modality (Rx entered vs reatment initiation modality ) NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration Index: TDDefs.h =================================================================== diff -u -rc416b53b4723863a6016cf0bae9f466493b32c22 -r3b43acb32a0253d05fd98e65cdcb5e7fb7a41870 --- TDDefs.h (.../TDDefs.h) (revision c416b53b4723863a6016cf0bae9f466493b32c22) +++ TDDefs.h (.../TDDefs.h) (revision 3b43acb32a0253d05fd98e65cdcb5e7fb7a41870) @@ -700,8 +700,9 @@ /// Enumeration of treatment modality type enum Treatment_Modality_Types { - TREATMENT_MODALITY_HD = 0, ///< Treatment modality Hemodialysis - TREATMENT_MODALITY_HDF, ///< Treatment modality Hemodiafiltration + TREATMENT_MODALITY_HD_SALINE_FLUID = 0, ///< Treatment modality Hemodialysis with saline fluid + TREATMENT_MODALITY_HDF_ONLINE_FLUID, ///< Treatment modality Hemodiafiltration online fluid + TREATMENT_MODALITY_HD_ONLINE_FLUID, ///< Treatment modality Hemodialysis with online fluid // TREATMENT_MODALITY_ISOLATED_UF, ///< Treatment modality Isolated UF // TODO uncomment in phase 3 when ISO UF feature is required NUM_OF_TREATMENT_MODALITY_TYPES ///< Total number of treatment modality types }; @@ -890,6 +891,17 @@ ///< Type for tube set types enumeration typedef enum Tube_Set_Types TUBE_SET_TYPE_T; +///< Enumeration of fluid types +enum Fluid_Types +{ + FLUID_TYPE_UNKNOWN = 0, ///< Unknown fluid type + FLUID_TYPE_SALINE, ///< Saline fluid type + FLUID_TYPE_SUBSTITUTE, ///< Substitution fluid type + NUM_OF_FLUID_TYPES +}; +///< Type for fluid types enumeration +typedef enum Fluid_Types FLUID_TYPE_T; + /**@}*/ #endif