Index: AlarmDefs.h =================================================================== diff -u -r74c7c0192905b51c0b9cb209372703a7e884c0c3 -r339a42dfb1c7ebd43df0393ed8ef972291b8b233 --- AlarmDefs.h (.../AlarmDefs.h) (revision 74c7c0192905b51c0b9cb209372703a7e884c0c3) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 339a42dfb1c7ebd43df0393ed8ef972291b8b233) @@ -184,6 +184,11 @@ ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE = 152, ///< FP membrane flush integrated out of range 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 + ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD = 156, ///< DD blood leak invalid calibration record + ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE = 157, ///< DD blood leak sensor embedded mode failure + ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE = 158, ///< DD blood leak sensor set point failure + ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT = 159, ///< DD blood leak sensor recovering please wait NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -464,24 +469,29 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, - { ALARM_PRIORITY_MEDIUM, 432, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, - { ALARM_PRIORITY_MEDIUM, 433, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, - { ALARM_PRIORITY_MEDIUM, 434, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, - { ALARM_PRIORITY_MEDIUM, 435, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, - { ALARM_PRIORITY_MEDIUM, 436, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, - { ALARM_PRIORITY_MEDIUM, 437, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_FLOW_RATE_LOW_RANGE }, + { ALARM_PRIORITY_MEDIUM, 432, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE }, + { ALARM_PRIORITY_MEDIUM, 433, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_MEDIUM, 434, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE }, + { ALARM_PRIORITY_MEDIUM, 435, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_MEDIUM, 436, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_MEDIUM, 437, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, + { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID - { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, 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, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, TRUE , FALSE, 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, TRUE, FALSE, 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, 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, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DD_BLOOD_LEAK_DETECTED }, + { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD }, + { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE }, + { ALARM_PRIORITY_HIGH, 2, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE }, + { ALARM_PRIORITY_MEDIUM, 698, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -508,6 +518,9 @@ { 1, ALARM_ID_TD_UI_COMM_POST_FAILED }, { 1, ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_TD_STUCK_BUTTON_TEST_FAILED }, + { 1, ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD }, + { 1, ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE }, + { 1, ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE }, { 10, ALARM_ID_TD_SOFTWARE_FAULT }, { 10, ALARM_ID_TD_UI_COMM_TIMEOUT }, { 10, ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS }, @@ -604,6 +617,7 @@ { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD }, { 111, ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD }, + { 150, ALARM_ID_DD_BLOOD_LEAK_DETECTED }, { 200, ALARM_ID_TD_VENOUS_PRESSURE_LOW }, { 201, ALARM_ID_TD_VENOUS_PRESSURE_HIGH }, { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW }, @@ -620,6 +634,7 @@ { 435, ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE }, { 436, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE }, { 437, ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE }, + { 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 }, @@ -825,6 +840,11 @@ { 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. | "}, { 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. | "}, + { 156 , ALARM_ID_DD_BLOOD_LEAK_INVALID_CAL_RECORD , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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 POST: BLD Cal | DD blood leak sensor invalid calibration record | If the BLD data that was received from NVDataMgmt is NOT legitimate. | "}, + { 157 , ALARM_ID_DD_BLOOD_LEAK_SENSOR_EMBEDDED_MODE_FAILURE , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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 POST: BLD Config Emb Mode | DD blood leak sensor embedded mode communication failed | If the blood leak sensor embedded mode is unresponsive. | "}, + { 158 , ALARM_ID_DD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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 POST: BLD Config Set Point | DD blood leak sensor set point set failure | If the set point of the blood leak sensor does not match the set point in the calibration record. | "}, + { 159 , ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT , "DD | Blood Leak: Bypass | The device is currently in bypass due to a potential blood leak.\n- If blood is present upon visual inspection, press\n END TREATMENT to terminate treatment without rinseback.\n- If blood is not visualized, check dialysate for blood using\n test strip.\n- Follow facility policy to Resume/OK or END TREATMENT. | Blood Stop: Dialyzer Blood Leak Bypass | DD blood leak detected and it is in the process of attempting to remove the bubbles/foam | If the blood leak is detected in treatment, the HD device transitions to treatment stop and runs in bypass until there is no blood detected. The user can hit end treatment anytime. | "}, }; #endif // manual alarms Index: DDDefs.h =================================================================== diff -u -rdf0b360f1a0f5a23ac46b4baaddf7103791cc920 -r339a42dfb1c7ebd43df0393ed8ef972291b8b233 --- DDDefs.h (.../DDDefs.h) (revision df0b360f1a0f5a23ac46b4baaddf7103791cc920) +++ DDDefs.h (.../DDDefs.h) (revision 339a42dfb1c7ebd43df0393ed8ef972291b8b233) @@ -173,8 +173,10 @@ DD_GEND_STATE_START = 0, ///< Gen dialysate start 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 + DD_GEND_SPENT_CHAMBER_FILL_STATE, ///< Gen dialysate - spent chamber fill state + DD_GEND_BICARB_CHAMBER_FILL_STATE, ///< Gen dialysate - bicarb chamber fill state + DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause 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 @@ -415,9 +417,11 @@ BAL_CHAMBER_STATE_START = 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_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_END, ///< Balancing Chamber state 2 fill end state NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states }; @@ -450,4 +454,25 @@ /**@}*/ +/** + * @addtogroup SpentChamberFill + * @{ + */ + +/// Enumeration of Spent chamber fill exec states. +enum Spent_Chamber_Fill_Exec_States +{ + SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_STATE1_FILL_START, ///< Spent chamber fill state 1 fill start state + SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL, ///< Spent chamber fill state 1 dosing control + SPENT_CHAMBER_FILL_STATE1_FILL_END, ///< Spent chamber fill state 1 fill end state + SPENT_CHAMBER_FILL_STATE2_FILL_START, ///< Spent chamber fill state 2 fill start state + SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL, ///< Spent chamber fill state 2 dosing control + SPENT_CHAMBER_FILL_STATE2_FILL_END, ///< Spent chamber fill state 2 fill end state + NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES ///< Number of spent chamber fill states +}; +typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration + +/**@}*/ + #endif Index: MsgDefs.h =================================================================== diff -u -r02353322959112f5280e042b0f17c1e6210f7d88 -r339a42dfb1c7ebd43df0393ed8ef972291b8b233 --- MsgDefs.h (.../MsgDefs.h) (revision 02353322959112f5280e042b0f17c1e6210f7d88) +++ MsgDefs.h (.../MsgDefs.h) (revision 339a42dfb1c7ebd43df0393ed8ef972291b8b233) @@ -123,7 +123,11 @@ MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B, ///< TD treatment paused timer data. MSG_ID_DD_UF_DATA = 0x5C, ///< DD ultrafiltration data MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D, ///< FP Permeate tank broadcast data - MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E, ///< DD spent chamber fill broadcast data + MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x5E, ///< FP Inlet Pressure Check broadcast data + MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F, ///< UI solution infusion request + MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60, ///< TD solution infusion response + MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data + MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x62, ///< DD spent chamber fill broadcast data #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data #endif @@ -252,10 +256,18 @@ 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_AVAILABLE_TO_USE_3 = 0xA03F, ///< DD start pre-gen dialysate mode override request + MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F, ///< DD send blood embedded mode response MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041, ///< DD stop gen dialysate mode override request MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042, ///< DD set/reset safety shutdown override request + MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047, ///< DD blood leak data publish interval override request + MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048, ///< DD blood leak status override request + MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049, ///< DD blood leak set to embedded mode request + MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST = 0xA04A, ///< DD blood leak set embedded more command request + MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST = 0xA04B, ///< DD blood leak embedded mode information override request + MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C, ///< DD blood leak intensity moving average override request + MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D, ///< DD blood leak zeroing interval in milliseconds override request + MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E, ///< DD blood leak zero 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 @@ -308,6 +320,8 @@ MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A, ///< FP Permeate Tank data publish interval override request MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B, ///< FP Alarm State override request MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C, ///< FP alarm clear request + MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02D, ///< FP inlet pressure check data publish interval override request + MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB02E, ///< FP inlet pressure check time override request 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