Index: AlarmDefs.h =================================================================== diff -u -r23c6a623afe7b16729d3ebe15e492b7332381bcd -r4840658cc7b64ea35141bfb0692f2435e1763060 --- AlarmDefs.h (.../AlarmDefs.h) (revision 23c6a623afe7b16729d3ebe15e492b7332381bcd) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 4840658cc7b64ea35141bfb0692f2435e1763060) @@ -230,6 +230,9 @@ 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_DD_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE = 201, ///< DD chemical disinfect flush sample required + ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP = 202, ///< DD RO permeate sample collection requires removal of the dialysate cap + ALARM_ID_DD_TURN_OFF_INLET_WATER_VALVES = 203, ///< DD requests the user to turn off the inlet water valves NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -605,6 +608,9 @@ { 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_LOW, 716, ALM_SRC_DD, 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_DD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP }, + { ALARM_PRIORITY_MEDIUM, 590, ALM_SRC_DD, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DD_TURN_OFF_INLET_WATER_VALVES }, }; // 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. @@ -782,13 +788,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 }, @@ -1041,6 +1050,9 @@ { 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_DD_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE , "DD | Residual Chemical Sampling | A water sample is needed to confirm the absence of residual chemical following disinfection.\n- Collect the required sample.\n- Test the sample according to facility policy.\n- Confirm the absence of residual chemical disinfectant. | Cleaning: Chem Residual Sampling | A sample is required to verify that residual chemical disinfectant has been removed | If DD requests residual chemical sampling during the chemical disinfect flush sequence. | "}, + { 202 , ALARM_ID_DD_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP , "DD | RO Permeate Sampling | An RO permeate sample is required.\n- Remove the dialysate cap as instructed.\n- Collect the RO permeate sample.\n- Test the sample according to facility policy.\n- Press Resume/OK when sample collection is complete. | Cleaning: RO Permeate Sampling | An RO permeate sample must be collected during the cleaning workflow | If DD requests RO permeate sample collection and removal of the dialysate cap. | "}, + { 203 , ALARM_ID_DD_TURN_OFF_INLET_WATER_VALVES , "DD | Turn Off Inlet Water Valves | Heat disinfection is in progress.\n- Turn off the inlet water valves.\n- Press Resume/OK after the inlet water valves have been turned off. | Cleaning: Turn Off Inlet Water Valves | The user must turn off the inlet water valves during nocturnal heat disinfection | If the user selected nocturnal heat disinfection and the DD reservoirs have been filled. | "}, }; #endif // manual alarms Index: DDDefs.h =================================================================== diff -u -rada74713e29bcb1fc906b5ffef3f82a4af225670 -r4840658cc7b64ea35141bfb0692f2435e1763060 --- DDDefs.h (.../DDDefs.h) (revision ada74713e29bcb1fc906b5ffef3f82a4af225670) +++ DDDefs.h (.../DDDefs.h) (revision 4840658cc7b64ea35141bfb0692f2435e1763060) @@ -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 -re42ee6229ed8530bc3aa875909a1dbb52b61b118 -r4840658cc7b64ea35141bfb0692f2435e1763060 --- MsgDefs.h (.../MsgDefs.h) (revision e42ee6229ed8530bc3aa875909a1dbb52b61b118) +++ MsgDefs.h (.../MsgDefs.h) (revision 4840658cc7b64ea35141bfb0692f2435e1763060) @@ -219,6 +219,11 @@ 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 + 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 @@ -587,6 +592,10 @@ 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 ) + REQUEST_REJECT_REASON_FP_BUSY = 62, ///< Treatment cannot initiate if FP is busy + REQUEST_REJECT_REASON_FP_SERVICE_IS_DUE = 63, ///< FP service is due + REQUEST_REJECT_REASON_DD_TEMPERATURE_OUT_OF_RANGE = 64, ///< DD temperature too high + REQUEST_REJECT_REASON_DD_BUSY = 65, ///< Treatment cannot initiate if DD is busy 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 -r9236267792fff4fb0e49742f918baf8c6fedeca9 -r4840658cc7b64ea35141bfb0692f2435e1763060 --- TDDefs.h (.../TDDefs.h) (revision 9236267792fff4fb0e49742f918baf8c6fedeca9) +++ TDDefs.h (.../TDDefs.h) (revision 4840658cc7b64ea35141bfb0692f2435e1763060) @@ -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). };