Index: AlarmDefs.h =================================================================== diff -u -r45907574a0110204746643f627960946ee7e06b6 -r915dbd9d975a43f9ea6d1cddba70890f2b663bc6 --- AlarmDefs.h (.../AlarmDefs.h) (revision 45907574a0110204746643f627960946ee7e06b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 915dbd9d975a43f9ea6d1cddba70890f2b663bc6) @@ -229,6 +229,9 @@ ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE = 197, ///< DD D92 pump rpm out of range 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_DD_TURN_OFF_INLET_WATER_VALVES = 200, + ALARM_ID_DD_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE = 201, + ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP = 202, NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -576,6 +579,9 @@ { 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_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, 590, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DD_TURN_OFF_INLET_WATER_VALVES }, + { ALARM_PRIORITY_LOW, 716, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE }, + { ALARM_PRIORITY_LOW, 716, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP }, }; // 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. @@ -752,13 +758,16 @@ { 436, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, { 437, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, { 590, ALARM_ID_TD_PRIME_COMPLETED_MEDIUM }, + { 590, ALARM_ID_DD_TURN_OFF_INLET_WATER_VALVES }, { 698, ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT }, { 700, ALARM_ID_TD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE }, { 700, ALARM_ID_TD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { 710, ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, { 711, ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 715, ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 716, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION }, + { 716, ALARM_ID_DD_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE }, + { 716, ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP }, { 730, ALARM_ID_TD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 745, ALARM_ID_TD_SYRINGE_DETECTED }, { 850, ALARM_ID_BATTERY_LOW }, @@ -1010,6 +1019,8 @@ { 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. | "}, { 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_DG_TURN_OFF_INLET_WATER_VALVES , "DD | Turn Off Inlet Water Valves | Heat disinfection is in progress.\n- Turn off inlet water valves. | Cleaning: Turn Off Inlet Water Valves | Selection of nocturnal heat disinfect | If the user has selected the nocturnal heat disinfect, the DG Software prompts the user to turn off the inlet water valves once the reservoirs are filled. | "}, + { 201 , ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE , "DD | Residual Chemical Sampling | A water sample is needed to confirm the \nabsence of residual chemical following disinfection. \n- Test sample according to facility policy. \n- Confirm absence of residual chemical disinfectant. | Cleaning: Chem Residual Sampling | Collect sample to check the chemical disinfectant acid | Chemical disinfect flush sample alarm is prompted. | "}, }; #endif // manual alarms Index: DDDefs.h =================================================================== diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -r915dbd9d975a43f9ea6d1cddba70890f2b663bc6 --- DDDefs.h (.../DDDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3) +++ DDDefs.h (.../DDDefs.h) (revision 915dbd9d975a43f9ea6d1cddba70890f2b663bc6) @@ -33,11 +33,13 @@ DD_MODE_INIT, ///< Initialization & POST mode DD_MODE_STAN, ///< Standby mode DD_MODE_PREG, ///< Dialysate Pre-Generation mode + DD_MODE_GENE, ///< Generation idle mode DD_MODE_GEND, ///< Generate Dialysate mode DD_MODE_POSG, ///< Post Dialysate Generation mode DD_MODE_HEAT, ///< Heat Disinfect mode DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode + DD_MODE_CHFL, ///< Chemical Disinfect Flush mode DD_MODE_UPDT, ///< Update mode DD_MODE_NLEG, ///< Not legal - an illegal mode transition occurred NUM_OF_DD_MODES ///< Number of DD operation modes Index: MsgDefs.h =================================================================== diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -r915dbd9d975a43f9ea6d1cddba70890f2b663bc6 --- MsgDefs.h (.../MsgDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3) +++ MsgDefs.h (.../MsgDefs.h) (revision 915dbd9d975a43f9ea6d1cddba70890f2b663bc6) @@ -214,6 +214,11 @@ MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6, ///< DD conductivity resistance data broadcast. 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_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0xF1, ///< TD request service schedule data from TD + MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0xF2, ///< TD request DD usage info + MSG_ID_TD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DD = 0xF3, + MSG_ID_TD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DD = 0xF4, + MSG_ID_TD_DISINFECT_RESPONSE = 0xF5, // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID Index: TDDefs.h =================================================================== diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r915dbd9d975a43f9ea6d1cddba70890f2b663bc6 --- TDDefs.h (.../TDDefs.h) (revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60) +++ TDDefs.h (.../TDDefs.h) (revision 915dbd9d975a43f9ea6d1cddba70890f2b663bc6) @@ -104,8 +104,8 @@ STANDBY_START_STATE = 0, ///< Start standby (home actuators). STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment. STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option. - STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE, ///< Wait for DD cleaning mode command response state. - STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE, ///< Wait for DD cleaning mode to start state. + STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE, ///< Wait for DD cleaning mode command response state. + STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE, ///< Wait for DD cleaning mode to start state. STANDBY_CLEANING_MODE_IN_PROGRESS_STATE, ///< Cleaning mode in progress state. NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes). };