Index: AlarmDefs.h =================================================================== diff -u -r4709c4af2b480b2e4d7e68dc30df1f509837849e -raebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc --- AlarmDefs.h (.../AlarmDefs.h) (revision 4709c4af2b480b2e4d7e68dc30df1f509837849e) +++ AlarmDefs.h (.../AlarmDefs.h) (revision aebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc) @@ -119,9 +119,9 @@ 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_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_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE = 91, ///< DD generate dialysate hydraulics chamber pressure out of range - ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE = 92, ///< DD generate dialysate fresh dialysate pressure out of range - ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE = 93, ///< DD generate dialysate spent dialysate pressure out of range + ALARM_ID_AVAILABLE_91 = 91, ///< Available alarms + ALARM_ID_AVAILABLE_92 = 92, ///< Available alarms + ALARM_ID_AVAILABLE_93 = 93, ///< Available alarms ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE = 94, ///< DD balance chamber state1 fill initiated and pressure drop is not in range ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE = 95, ///< DD balance chamber state2 fill initiated and pressure drop is not in range ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 96, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault = 96, ///< Available alarms @@ -386,9 +386,9 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_91 }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_92 }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_93 }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, @@ -519,9 +519,6 @@ { 110, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, { 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_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE }, - { 110, ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE }, - { 110, ALARM_ID_DD_GEND_SPENT_DIAL_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 }, { 110, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, @@ -543,6 +540,9 @@ { 700, ALARM_ID_TD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { 710, ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, { 852, ALARM_ID_TD_AC_POWER_LOST }, + { 999, ALARM_ID_AVAILABLE_91 }, + { 999, ALARM_ID_AVAILABLE_92 }, + { 999, ALARM_ID_AVAILABLE_93 }, { 999, ALARM_ID_AVAILABLE_97 }, { 999, ALARM_ID_AVAILABLE_98 }, { 999, ALARM_ID_AVAILABLE_99 }, @@ -678,9 +678,9 @@ { 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. | "}, { 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. | "}, - { 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 Press not in range | DD hydraulics chamber degassed pressure is not in range | If the hydraulics chamber pressure is not between -11.7877 psig and -12.2789 psig. | "}, - { 92 , ALARM_ID_DD_GEND_FRESH_DIAL_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: Fresh dial Press not in range | DD fresh dialysate pressure is not in range | If the fresh dialysate pressure (< 21 psig or > 27 psig) not in range. | "}, - { 93 , ALARM_ID_DD_GEND_SPENT_DIAL_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: Spent dial Press not in range | DD spent dialysate pressure is not in range | If the spent dialysate pressure (< 27 psig or > 31 psig) not in range. | "}, + { 91 , ALARM_ID_AVAILABLE_91 , " | | | | | | "}, + { 92 , ALARM_ID_AVAILABLE_92 , " | | | | | | "}, + { 93 , ALARM_ID_AVAILABLE_93 , " | | | | | | "}, { 94 , ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_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 initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state1 fill in progress. | "}, { 95 , ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_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 initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state2 fill in progress. | "}, { 96 , ALARM_ID_DD_D74_COND_SENSOR_FPGA_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 Conductivity Sensor Error | DD conductivity sensor (D74) located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (D74) is reporting an error or FPGA is failing to read sensor. | "}, Index: DDDefs.h =================================================================== diff -u -r874231cdcb60d39c066329611f4e5cf287809221 -raebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc --- DDDefs.h (.../DDDefs.h) (revision 874231cdcb60d39c066329611f4e5cf287809221) +++ DDDefs.h (.../DDDefs.h) (revision aebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc) @@ -142,13 +142,10 @@ enum DD_GenD_Mode_States { DD_GEND_STATE_START = 0, ///< Gen dialysate start state - DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE, ///< Gen dialysate Hydraulic chamber water inlet check state - DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE, ///< Gen dialysate Hydraulic chamber pressure check state - DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate fresh dialysate pressure check state - DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate spent dialysate pressure check state - DD_GEND_PRODUCE_DIALYSATE_STATE, ///< Gen dialysate - produce dialysate state + DD_GEND_DIALYSATE_BYPASS_STATE, ///< Gen dialysate - Bypass dialysate state DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - deliver dialysate state DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + DD_GEND_ISOLATED_UF_STATE, ///< Gen dialysate - Isolated ultrafiltration state NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states }; typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration Index: MsgDefs.h =================================================================== diff -u -r874231cdcb60d39c066329611f4e5cf287809221 -raebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc --- MsgDefs.h (.../MsgDefs.h) (revision 874231cdcb60d39c066329611f4e5cf287809221) +++ MsgDefs.h (.../MsgDefs.h) (revision aebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc) @@ -91,6 +91,7 @@ MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x3B, ///< RO Gen Permeate data broadcast MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x3C, ///< DD Pre-gen dialysate mode data MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x3D, ///< DD Post-gen dialysate mode data + MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x3E, ///< DD Pre Generate dialysate request data coming from TD. #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data #endif @@ -206,6 +207,7 @@ MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C, ///< DD heaters PWM period override request MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D, ///< DD Pre generate dialysate mode data publish interval override request MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD Post generate dialysate mode data publish interval override request + MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F, ///< DD start pre-gen dialysate mode override request #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00, ///< DD piston pump data publish interval override request MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01, ///< DD piston pump start/stop override request