Index: AlarmDefs.h =================================================================== diff -u -r56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee -r74e9720060b86a4fe2d54533003f3961568a9c34 --- AlarmDefs.h (.../AlarmDefs.h) (revision 56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 74e9720060b86a4fe2d54533003f3961568a9c34) @@ -181,7 +181,7 @@ ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 149, ///< FP inlet pressure regulator out of range ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 150, ///< FP filter health pressure out of range ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT = 151, ///< FP membrane flush timeout - ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE = 152, ///< FP membrane flush integrated out of range + ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT = 152, ///< FP concentrate flush tank full timeout ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT = 153, ///< FP tank full time out alarm ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE = 154, ///< DD dialysate temperature sensors out of range ALARM_ID_DD_BLOOD_LEAK_DETECTED = 155, ///< DD blood leak detected @@ -488,7 +488,7 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 150, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DD_BLOOD_LEAK_DETECTED }, @@ -605,7 +605,7 @@ { 110, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, { 110, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { 110, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT }, { 110, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, { 110, ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE }, { 110, ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR }, @@ -847,7 +847,7 @@ // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition { 150 , ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE , "FP | FP: Filter Health | 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. | FP Filters: Pressure difference too high | FP pressure difference between the filters is too high | If the difference between M3 and P8 is ≥ 10 PSI after 2 minutes | "}, { 151 , ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT , "FP | FP: Filter Health | 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. | FP Filters: Permeate conductivity high | FP conductivity after flushing the system is too high | If P18 conductivity > 200 uS/cm after 120 seconds ± 150ms of flushing. | "}, - { 152 , ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE , "FP | FP: Filter Health | 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. | FP Filters: Volume difference too high | FP volume difference between integrated flow and expected volume | If P7 is <90% of the target integrated volume ( 1L ) after 30 seconds ± 150ms of flushing. | "}, + { 152 , ALARM_ID_FP_CONCENTRATE_FLUSH_TANK_FULL_TIMEOUT , "FP | FP: Filter Health | 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. | FP Filters: Permeate Tank Fill Timeout | FP took more than 60 seconds to fill the permeate tank | If the permeate tank is not full after 60 seconds into wait for tank full state during concentrate flush. | "}, { 153 , ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT , "FP | FP: Permeate Overfill | 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. | FP Tank: Tank is too full | FP tank level is too high | If the float sensor reads high for at least 60 seconds | "}, { 154 , ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_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: D28 and D30 Delta | DD dialysate temperature sensors drift timeout. | If D28 and D30 have drifted for more 1 C for a certain period of time. | "}, { 155 , ALARM_ID_DD_BLOOD_LEAK_DETECTED , "DD | Blood Leak | A blood leak has been detected. \n- Visually inspect dialysate return line for blood.\n- Press Resume/OK to proceed to the next step. Dialysate will\n remain in bypass. | Blood Stop: Dialyzer Blood Leak | DD blood leak detected alarm | If the blood leak is detected based on the blood leak status reported by the sensor. | "}, Index: FPDefs.h =================================================================== diff -u -r82801b7d10ba6178ca0c03f9377930c8f22b52f7 -r74e9720060b86a4fe2d54533003f3961568a9c34 --- FPDefs.h (.../FPDefs.h) (revision 82801b7d10ba6178ca0c03f9377930c8f22b52f7) +++ FPDefs.h (.../FPDefs.h) (revision 74e9720060b86a4fe2d54533003f3961568a9c34) @@ -202,6 +202,7 @@ enum FP_Concentrate_Flush_States { CONC_FLUSH_IN_PROGRESS = 0, ///< Concentrate Flush in progress state + CONC_FLUSH_WAIT_FOR_TANK_FULL, ///< Concentrate Flush wait for tank full state CONC_FLUSH_PAUSED, ///< Concentrate Flush paused state NUM_OF_CONC_FLUSH_STATES ///< Number of Concentrate flush states }; Index: MsgDefs.h =================================================================== diff -u -r56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee -r74e9720060b86a4fe2d54533003f3961568a9c34 --- MsgDefs.h (.../MsgDefs.h) (revision 56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee) +++ MsgDefs.h (.../MsgDefs.h) (revision 74e9720060b86a4fe2d54533003f3961568a9c34) @@ -141,6 +141,7 @@ MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D, ///< TD date and time response MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E, ///< DD date and time request MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F, ///< DD date and time response + MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x70, ///< FP broadcast RO Rejection ratio data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -353,7 +354,10 @@ MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor reading override request MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor temperature override request MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033, ///< FP set start stop signal for generate permeate + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034, ///< FP RO rejection ratio data publish interval override request + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035, ///< FP override request for filtered all time RO rejection value + MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log MSG_ID_FP_DEBUG_EVENT = 0xFFF3, ///< FP debug event text to be logged in event log