Index: AlarmDefs.h =================================================================== diff -u -rcd07589027082929f8c94674d1d901e6f8de7235 -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba --- AlarmDefs.h (.../AlarmDefs.h) (revision cd07589027082929f8c94674d1d901e6f8de7235) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba) @@ -267,6 +267,8 @@ ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 229, ///< HD no cartridge self-test timeout ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 230, ///< HD dry self-test timeout ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT = 231, ///< DG temperature sensor error flag fault. + ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION = 232, ///< HD blood flow invalid calibration + ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION = 233, ///< HD dialysate flow invalid calibration NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -506,7 +508,7 @@ { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_DOOR_OPENED { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_AVAILABLE_4 - { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED @@ -609,6 +611,8 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT + { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION + { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: DGDefs.h =================================================================== diff -u -ra1a5a19a97fd1804ac0c03708fa07fdcc6a293f4 -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba --- DGDefs.h (.../DGDefs.h) (revision a1a5a19a97fd1804ac0c03708fa07fdcc6a293f4) +++ DGDefs.h (.../DGDefs.h) (revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba) @@ -159,7 +159,8 @@ DG_FILL_MODE_STATE_BICARB_PUMP_CHECK, ///< Run bicarb concentrate pump and check conductivity range DG_FILL_MODE_STATE_ACID_PUMP_CHECK, ///< Run acid concentrate pump and check conductivity range DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION, ///< Dialysate production state - DG_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Deliver dialysate state + DG_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Deliver dialysate state + DG_FILL_MODE_STATE_PAUSED, ///< Dialysate generation pause state NUM_OF_DG_FILL_MODE_STATES ///< Number of fill mode states }; typedef enum DG_Fill_Mode_States DG_FILL_MODE_STATE_T; ///< Type for DG fill mode states enumeration Index: HDDefs.h =================================================================== diff -u -r75494a081cf9e7e6e882b471f2d7e7883f467e5a -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba --- HDDefs.h (.../HDDefs.h) (revision 75494a081cf9e7e6e882b471f2d7e7883f467e5a) +++ HDDefs.h (.../HDDefs.h) (revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba) @@ -209,7 +209,6 @@ NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< No cartridge occlusion sensors self-test state NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE, ///< No cartridge blood flow meter self-test state NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE, ///< No cartridge dialysate flow meter self-test state - NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state NO_CART_SELF_TESTS_HOME_VALVES_STATE, ///< No cartridge home valves state NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE, ///< No cartridge home syringe pump state Index: MsgDefs.h =================================================================== diff -u -re8b2efe4d8501f4fa3ad218867ce8247a1c21e10 -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba --- MsgDefs.h (.../MsgDefs.h) (revision e8b2efe4d8501f4fa3ad218867ce8247a1c21e10) +++ MsgDefs.h (.../MsgDefs.h) (revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba) @@ -400,6 +400,7 @@ REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE = 34, ///< Treatment cannot initiate if DG is not in standby idle state REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT = 35, ///< Request message not formatted properly REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME = 36, ///< Given date/time is invalid + REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED = 37, ///< Treatment cannot initiate if an alarm with no new treatment property has triggered before 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