Index: AlarmDefs.h =================================================================== diff -u -r7238f72393ddb8dd8bf835d56382060067c45153 -r12f358406e02923e7fb840f1f3463a4b45a78ef0 --- AlarmDefs.h (.../AlarmDefs.h) (revision 7238f72393ddb8dd8bf835d56382060067c45153) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 12f358406e02923e7fb840f1f3463a4b45a78ef0) @@ -116,9 +116,9 @@ ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS = 85, ///< FP too many bad crcs ALARM_ID_FP_VALVE_CONTROL_FAILURE = 86, ///< FP valve control failure ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE = 87, ///< DD balance chamber state1 fill start pressure not in range - ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE = 88, ///< DD balance chamber state1 fill end pressure not in range + ALARM_ID_DD_AVAILABLE_1 = 88, ///< Available alarm ID 1 ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE = 89, ///< DD balance chamber state2 fill start pressure not in range - ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE = 90, ///< DD balance chamber state2 fill end pressure not in range + ALARM_ID_DD_AVAILABLE_2 = 90, ///< Available alarm ID 2 ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE = 91, ///< DD generate dialysate hydraulics chamber ngative pressure out of range ALARM_ID_DD_BICARB_FILL_TIMEOUT_FAULT = 92, ///< DD spent chamber fill timeout fault ALARM_ID_DD_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE = 93, ///< DD D79 rinse pump commanded vs measured speed out of tolerance @@ -473,9 +473,9 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_VALVE_CONTROL_FAILURE }, { 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_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, - { 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_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 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_AVAILABLE_1 }, { 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_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, - { 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_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 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_AVAILABLE_2 }, { 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_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, { 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_BICARB_FILL_TIMEOUT_FAULT }, { 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_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE }, @@ -684,9 +684,9 @@ { 110, ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON }, { 110, ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS }, { 110, ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, - { 110, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_AVAILABLE_1 }, { 110, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, - { 110, ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_AVAILABLE_2 }, { 110, ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, @@ -894,9 +894,9 @@ { 85 , ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS , "RO | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | RO Fault: CAN CRC Comm | RO Too many bad CRCs detected on received system messages | If too many bad message CRCs are received within a set period of time | "}, { 86 , ALARM_ID_RO_VALVE_CONTROL_FAILURE , "RO | Service Required: Filtration Device | A problem was detected with the filtration 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. | RO Fault: Valve Control | RO FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, { 87 , ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_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: BC Pressure not in range | DD balancing chamber state 1 fill start pressure is not in range | If the fresh dialysate pressure (< 21 psig or > 27 psig) and spent dialysate pressure (< 27 psig or > 31 psig) not in range for balancing chamber state1 fill start. | "}, - { 88 , ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_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: BC Pressure not in range | DD balancing chamber state 1 fill end pressure is not in range | If the fresh dialysate pressure (< 21 psig or > 27 psig) and spent dialysate pressure (< 27 psig or > 31 psig) not in range for balancing chamber state1 fill end. | "}, + { 88 , ALARM_ID_DD_AVAILABLE_1 , "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: Alarm availabe | AVAILABLE | AVAILABLE. | "}, { 89 , ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_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: BC Pressure not in range | DD balancing chamber state 2 fill start pressure is not in range | If the fresh dialysate pressure (< 21 psig or > 27 psig) and spent dialysate pressure (< 27 psig or > 31 psig) not in range for balancing chamber state2 fill start. | "}, - { 90 , ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_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: BC Pressure not in range | DD balancing chamber state 2 fill end pressure is not in range | If the fresh dialysate pressure (< 21 psig or > 27 psig) and spent dialysate pressure (< 27 psig or > 31 psig) not in range for balancing chamber state2 fill end. | "}, + { 90 , ALARM_ID_DD_AVAILABLE_2 , "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: Alarm availabe | AVAILABLE | AVAILABLE. | "}, { 91 , ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_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: Hyd Cham Neg Pres not in range | DD hydraulics chamber degassing pressure is not in range | If the hydraulics chamber pressure is not less than or equal to calculated target degas pressure psig. | "} { 92 , ALARM_ID_DD_BICARB_FILL_TIMEOUT_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \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 Bicarb Chamber fill timeout Error | DD Bicarb chamber fill timeout error | If Bicarb chamber fill time > = 1 seconds | "}, { 93 , ALARM_ID_DD_D79_RINSE_PUMP_SPEED_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: Rinse Pump Speed Fault | DD D79 rinse pump commanded vs measured speed out of tolerance | If rinse pump measured RPM deviates beyond 10%% of target RPM when pump is commanded on. Data1=measured RPM, Data2=target RPM. | "}, Index: DDDefs.h =================================================================== diff -u -r05353eda0fcd9b24209f09ca343ee71eaed8b7d8 -r12f358406e02923e7fb840f1f3463a4b45a78ef0 --- DDDefs.h (.../DDDefs.h) (revision 05353eda0fcd9b24209f09ca343ee71eaed8b7d8) +++ DDDefs.h (.../DDDefs.h) (revision 12f358406e02923e7fb840f1f3463a4b45a78ef0) @@ -434,11 +434,11 @@ BAL_CHAMBER_STATE_IDLE = 0, ///< Initial state of balancing chamber BAL_CHAMBER_STATE1_FILL_START, ///< Balancing chamber state 1 fill start state BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 1 Bicarb and acid dosing control state - BAL_CHAMBER_STATE1_VALVES_CLOSE, ///< Balancing Chamber state 1 valves close state + BAL_CHAMBER_STATE1_FILL_DETECT_COMPLETE, ///< Balancing Chamber state 1 fill detect complete state BAL_CHAMBER_STATE1_FILL_END, ///< Balancing Chamber state 1 fill end state BAL_CHAMBER_STATE2_FILL_START, ///< Balancing chamber state 2 fill start state BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 2 Bicarb and acid dosing control state - BAL_CHAMBER_STATE2_VALVES_CLOSE, ///< Balancing Chamber state 2 valves close state + BAL_CHAMBER_STATE2_FILL_DETECT_COMPLETE, ///< Balancing Chamber state 2 fill detect complete state BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states };