Index: AlarmDefs.h =================================================================== diff -u -r41447b9a2a6b3099662e25bc6a264595c75ed8fa -r7fd5b417a72b738bfccf9bb2222b1f668e4661fc --- AlarmDefs.h (.../AlarmDefs.h) (revision 41447b9a2a6b3099662e25bc6a264595c75ed8fa) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 7fd5b417a72b738bfccf9bb2222b1f668e4661fc) @@ -227,6 +227,9 @@ 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_DD_D92_PUMP_RPM_OUT_OF_RANGE = 197, ///< DD D92 pump rpm out of range + ALARM_ID_TD_RINSEBACK_TIMEOUT_ALARM = 198, ///< TD rinseback operation timeout + ALARM_ID_TD_RECIRC_TIMEOUT_WARNING = 199, ///< TD recirculate timeout warning + ALARM_ID_TD_RECIRC_TIMEOUT = 200, ///< TD recirculate timeout NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -289,7 +292,7 @@ ALARM_USER_ACTION_RINSEBACK = 1, ///< User selected rinseback from alarm recovery options ALARM_USER_ACTION_END_TREATMENT = 2, ///< User selected end treatment from alarm recovery options ALARM_USER_ACTION_ACK = 3, ///< User selected acknowledge (ok) from alarm recovery options - ALARM_USER_ACTION_TEMPOARY_BREAK = 4, ///< User selected temporary break + ALARM_USER_ACTION_TEMPORARY_BREAK = 4, ///< User selected temporary break NUMBER_OF_ALARM_USER_ACTIONS ///< Number of alarm user actions }; typedef enum Alarm_User_Actions ALARM_USER_ACTION_T; ///< Type for alarm user actions enumeration @@ -572,6 +575,9 @@ { 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_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 11, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_RINSEBACK_TIMEOUT_ALARM }, + { ALARM_PRIORITY_LOW, 746, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_RECIRC_TIMEOUT_WARNING }, + { ALARM_PRIORITY_HIGH, 13, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_RECIRC_TIMEOUT }, }; // 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. @@ -645,9 +651,11 @@ { 10, ALARM_ID_TD_CPU_RAM_ERROR }, { 10, ALARM_ID_DD_CPU_RAM_ERROR }, { 11, ALARM_ID_TD_BLOOD_SITTING_TOO_LONG }, + { 11, ALARM_ID_TD_RINSEBACK_TIMEOUT_ALARM }, { 12, ALARM_ID_TD_VENOUS_BUBBLE_DETECTED }, { 13, ALARM_ID_TD_AIR_TRAP_FILL_TIMEOUT }, { 13, ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT }, + { 13, ALARM_ID_TD_RECIRC_TIMEOUT }, { 100, ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT }, { 110, ALARM_ID_DD_CRITICAL_DATA_ERROR }, { 110, ALARM_ID_DD_WATCHDOG_EXPIRED }, @@ -755,6 +763,7 @@ { 716, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION }, { 730, ALARM_ID_TD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 745, ALARM_ID_TD_SYRINGE_DETECTED }, + { 746, ALARM_ID_TD_RECIRC_TIMEOUT_WARNING }, { 850, ALARM_ID_BATTERY_LOW }, { 852, ALARM_ID_TD_AC_POWER_LOST }, { 999, ALARM_ID_DD_AVAILABLE_1 }, @@ -1001,7 +1010,10 @@ { 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. | "}, - { 196 , ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE , "DD | Service Required: Dialysate 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 Fault: Subtitution Pump Fault | DD substitution pump RPM out of range | If the substitution pump RPM > 20.0 of the target RPM. | "}, + { 197 , ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE , "DD | Service Required: Dialysate 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 Fault: Subtitution Pump Fault | DD substitution pump RPM out of range | If the substitution pump RPM > 20.0 of the target RPM. | "}, + { 199 , ALARM_ID_TD_RINSEBACK_TIMEOUT_ALARM , "TD | Blood Pump Stop Time Exceeded | The blood pump has been off for too long.\n- Treatment must be terminated without rinseback. | Blood Stop: Blood Clot Risk | TD in treatment rinseback operation timeout | If the maximum time in rinseback operation has been exceeded. | "}, + { 199 , ALARM_ID_TD_RECIRC_TIMEOUT_WARNING , "TD | Temporary Break: Time Limit Approaching | The temporary break time limit is approaching. | Warning: Recirculation Timeout Warning | Time left for Recirculation is 10 minutes. | System has been in Treatment: Recirculate states for 20 minutes. | "}, + { 200 , ALARM_ID_TD_RECIRC_TIMEOUT , "TD | Temporary Break: Time Limit Exceeded | The maximum temporary break time has been reached.\n- Blood pump has been stopped.\n- Select End Treatment to end the session. | Process: Recirculation Timeout | Recirculation timeout — system has been in recirculation state for 30 minutes. | System has been in Treatment: Recirculate states for 30 minutes. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r6fed2587728919d2b56084bfe0f9a01682c246ab -r7fd5b417a72b738bfccf9bb2222b1f668e4661fc --- MsgDefs.h (.../MsgDefs.h) (revision 6fed2587728919d2b56084bfe0f9a01682c246ab) +++ MsgDefs.h (.../MsgDefs.h) (revision 7fd5b417a72b738bfccf9bb2222b1f668e4661fc) @@ -210,7 +210,9 @@ MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2, ///< TD response to pause/resume Heparin delivery request MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available. MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4, ///< FFU signal DD update is available. - MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data. + //MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data. + MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5, ///< TD request for genric ui confirmation + MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI generic confirmation result to TD MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response @@ -301,6 +303,8 @@ MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058, ///< TD syringe pump ADC read counter override request MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059, ///< TD heparin bolus target rate override request MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060, ///< TD set syringe pump force sensor DAC calibration request + MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE = 0x8065, ///< TD rinseback volume override + MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8066, ///< TD rinseback publish interval broadcast override. MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in Index: TDDefs.h =================================================================== diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r7fd5b417a72b738bfccf9bb2222b1f668e4661fc --- TDDefs.h (.../TDDefs.h) (revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60) +++ TDDefs.h (.../TDDefs.h) (revision 7fd5b417a72b738bfccf9bb2222b1f668e4661fc) @@ -540,7 +540,6 @@ RINSEBACK_PAUSED_STATE, ///< Rinseback paused state of the rinseback sub-mode state machine RINSEBACK_STOP_STATE, ///< Rinseback stopped (done) state of the rinseback sub-mode state machine RINSEBACK_RUN_ADDITIONAL_STATE, ///< Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine - RINSEBACK_RECONNECT_PATIENT_STATE, ///< Rinseback patient reconnect state of the rinseback sub-mode state machine NUM_OF_RINSEBACK_STATES ///< Number of rinseback sub-mode states }; typedef enum Rinseback_States RINSEBACK_STATE_T; ///< Type for rinseback states enumeration. @@ -553,11 +552,9 @@ REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE = 2, ///< User requests decrease in rinseback flow rate REQUESTED_USER_ACTION_RINSEBACK_PAUSE = 3, ///< User requests to pause rinseback operation REQUESTED_USER_ACTION_RINSEBACK_RESUME = 4, ///< User requests to resume rinseback operation - REQUESTED_USER_ACTION_RINSEBACK_END = 5, ///< User requests to end the rinseback operation - REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 6, ///< User requests an additional 10 mL of rinseback volume - REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_DISCONNECT = 7, ///< User confirms patient disconnected, saline bag clamped, re-connected to VBA, un-clamped, and lines shunted to start re-circulation - REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 8, ///< User requests to end treatment - REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT = 9, ///< User requests to return to treatment + REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 5, ///< User requests an additional 10 mL of rinseback volume + REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE = 6, ///< User requests to recirculate + REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 7, ///< User requests to end treatment NUM_OF_REQUESTED_RINSEBACK_USER_ACTIONS ///< Number of requested rinseback user actions }; /// Type for requested user actions enumeration. @@ -694,6 +691,7 @@ TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT, ///< Heart rate low alarm limit (BPM) TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT, ///< Heart rate high alarm limit (BPM) TREATMENT_PARAM_PRES_ALARM_PERSISTENCE, ///< Pressure alarms persistence (seconds) + TREATMENT_PARAM_TEMPORARY_BREAK_RECIRC_TIMEOUT, ///< Re-circulation timeout (minutes) NUM_OF_SYS_CONFIG_TREATMENT_PARAMS ///< Total number of treatment parameters }; typedef enum System_Config_Treatment_Params SYS_CONFIG_TREATMENT_PARAM_T; ///< Type for system configured treatment parameters enumeration @@ -855,15 +853,10 @@ enum Generic_Confirm_Id { GENERIC_CONFIRM_ID_NONE = 0, ///< Generic Confirm None - GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH, ///< Water flush stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT, ///< Heat disinfect stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL, ///< Chemical disinfect stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH, ///< Chemical disinfect flush stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL, ///< Chemical disinfect sample flush pass/fail + GENERIC_CONFIRM_ID_SHUT_DOWN, ///< Shutdown user confirmation GENERIC_CONFIRM_ID_TREATMENT_END, ///< End treatment user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL, ///< Active cool stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE, ///< RO permeate sample stop user confirmation - GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE, ///< RO permeate sample stop or dispense + GENERIC_CONFIRM_ID_RINSEBACK, ///< Rinseback user confirmation + GENERIC_CONFIRM_ID_TEMPORARY_BREAK, ///< Temporary break user confirmation NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs }; typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration