Index: AlarmDefs.h =================================================================== diff -u -rd1f00c0d4796ab9660986399705aea06907aa710 -r14ae35d9f75a9063c2291984c57dda72cf007212 --- AlarmDefs.h (.../AlarmDefs.h) (revision d1f00c0d4796ab9660986399705aea06907aa710) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 14ae35d9f75a9063c2291984c57dda72cf007212) @@ -647,10 +647,10 @@ { ALARM_PRIORITY_MEDIUM, 435, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, 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, ALM_SRC_FP, FALSE, FALSE , 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, ALM_SRC_FP, FALSE, FALSE , 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, ALM_SRC_FP, FALSE, FALSE , 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, ALM_SRC_FP, FALSE, FALSE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, 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, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_TEMPERATURE_OUT_CRITICAL_RANGE }, // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID @@ -663,11 +663,11 @@ { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , 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, ALM_SRC_DD, FALSE, TRUE , 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, ALM_SRC_DD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, - { 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_FILL_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_CRITICAL_OUT_RANGE }, - { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE }, - { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE }, - { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE }, + { ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, FALSE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, FALSE ,FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_CRITICAL_OUT_RANGE }, + { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, FALSE ,FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, FALSE ,FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE }, + { ALARM_PRIORITY_HIGH, 10, ALM_SRC_FP, FALSE ,FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 13, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT }, { ALARM_PRIORITY_HIGH, 10, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_SELF_TEST_FAILURE }, { ALARM_PRIORITY_HIGH, 10, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR }, @@ -697,7 +697,7 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_AUTO_LOAD_EJECT_HIGH_BP_TORQUE }, { ALARM_PRIORITY_HIGH, 206, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_AIR_PUMP_STALL }, { ALARM_PRIORITY_HIGH, 10, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_CPU_RAM_ERROR }, - { ALARM_PRIORITY_HIGH, 10, ALM_SRC_DD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_CPU_RAM_ERROR }, + { ALARM_PRIORITY_HIGH, 10, ALM_SRC_DD, FALSE ,TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_CPU_RAM_ERROR }, { ALARM_PRIORITY_HIGH, 1, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 1, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 202, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_EMPTY_SALINE_BAG }, Index: DDDefs.h =================================================================== diff -u -r78128d9126978673733e2e1b24e88ac72f6a3571 -r14ae35d9f75a9063c2291984c57dda72cf007212 --- DDDefs.h (.../DDDefs.h) (revision 78128d9126978673733e2e1b24e88ac72f6a3571) +++ DDDefs.h (.../DDDefs.h) (revision 14ae35d9f75a9063c2291984c57dda72cf007212) @@ -193,6 +193,7 @@ 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 + DD_GEND_PRIME_FLUID_DISCARD_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 -r4fd53bb9d8042fabbbb3d20c8b46edbc9558eb2f -r14ae35d9f75a9063c2291984c57dda72cf007212 --- MsgDefs.h (.../MsgDefs.h) (revision 4fd53bb9d8042fabbbb3d20c8b46edbc9558eb2f) +++ MsgDefs.h (.../MsgDefs.h) (revision 14ae35d9f75a9063c2291984c57dda72cf007212) @@ -215,6 +215,8 @@ MSG_ID_TD_PRE_TREATMENT_STATES_DATA = 0xB7, ///< TD Pre-Treatment states broadcast data.. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response + MSG_ID_DD_TD_PRIME_REQUEST_DATA = 0xC3, ///< DD to TD prime data request + MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7, ///< TD broadcast of prime data MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB, ///< DD substitution pump broadcast data. @@ -549,15 +551,14 @@ MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045, ///< FP response for defatured status to Dialin MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046, ///< FP set operation sub mode request MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047, ///< FP conductivity sensor resistance override request - MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting. MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049, ///< FP request for boost pump installation status from Dialin MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A, ///< FP response for boost pump installation status to Dialin MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B, ///< FP conductivity sensor version request MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C, ///< FP conductivity sensor version response MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D, ///< FP conductivity sensor cal request MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E, ///< FP conductivity sensor cal response - 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