Index: AlarmDefs.h =================================================================== diff -u -r7b4ab1218e9e24152373d7c11c4c0006c332fc7a -rf621619a1a439b97d9744c34bf3ef317e4499cc5 --- AlarmDefs.h (.../AlarmDefs.h) (revision 7b4ab1218e9e24152373d7c11c4c0006c332fc7a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f621619a1a439b97d9744c34bf3ef317e4499cc5) @@ -216,6 +216,7 @@ ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT = 184, ///< TD syringe pump prime timeout ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT = 185, ///< FP P9 conductivity sensor fpga fault ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT = 186, ///< FP P18 conductivity sensor fpga fault + ALARM_ID_TD_EMPTY_SALINE_BAG = 187, ///< TD empty saline bag alarm NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -549,6 +550,7 @@ { 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_PRIME_TIMEOUT }, { 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_P9_COND_SENSOR_FPGA_FAULT }, { 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_P18_COND_SENSOR_FPGA_FAULT }, + { 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 }, }; // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -695,6 +697,7 @@ { 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_EMPTY_SALINE_BAG }, { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW }, { 203, ALARM_ID_TD_ARTERIAL_PRESSURE_HIGH }, { 204, ALARM_ID_TD_TMP_PRESSURE_LOW }, @@ -957,6 +960,7 @@ { 184 , ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT , "TD | 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. | TD Fault: Pre- Tx Hep. Pump Timeout. | TD syringe pump timeout alarm | If the syringe pump priming > 5 seconds | "}, { 185 , ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT , "FP | Service Required: FP Device | A problem was detected with the FP 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. | FP Conductivity Sensor Error | FP conductivity sensor (P9) located in inlet water path reporting error or not being read successfully | Conductvity Sensor (P9) is reporting an error or FPGA is failing to read sensor. | "}, { 186 , ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT , "FP | Service Required: FP Device | A problem was detected with the FP 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. | FP Conductivity Sensor Error | FP conductivity sensor (P18) located in inlet water path reporting error or not being read successfully | Conductvity Sensor (P18) is reporting an error or FPGA is failing to read sensor. | "}, + { 187 , ALARM_ID_TD_EMPTY_SALINE_BAG , "TD | Blood Pump Stopped: Saline Bag Empty | The saline bag appears empty.\n- Check the saline bag and replace if empty. | Blood Stop: Saline Bag Empty | TD Saline bag is empty | If the measured arterial pressure < -300.0 mmHg for more than 250 msec. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -rbf926947342bad2327352d878c681401a6b2d994 -rf621619a1a439b97d9744c34bf3ef317e4499cc5 --- MsgDefs.h (.../MsgDefs.h) (revision bf926947342bad2327352d878c681401a6b2d994) +++ MsgDefs.h (.../MsgDefs.h) (revision f621619a1a439b97d9744c34bf3ef317e4499cc5) @@ -90,7 +90,7 @@ MSG_ID_FP_HEATER_DATA = 0x3A, ///< FP heater data broadcast MSG_ID_TD_TREATMENT_TIME_DATA = 0x3B, ///< TD treatment time data broadcast MSG_ID_TD_TREATMENT_STATE_DATA = 0x3C, ///< TD treatment state data broadcast - MSG_ID_TD_SALINE_BOLUS_DATA = 0x3D, ///< TD saline bolus status data broadcast + MSG_ID_TD_FLUID_BOLUS_DATA = 0x3D, ///< TD fluid bolus status data broadcast MSG_ID_TD_ULTRAFILTRATION_DATA = 0x3E, ///< TD ultrafiltration status data broadcast MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE = 0x3F, ///< UI treatment parameters to be validated by TD MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE = 0x40, ///< TD response to treatment parameter validation request @@ -124,8 +124,8 @@ 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_UI_SOLUTION_INFUSION_REQUEST = 0x5F, ///< UI solution infusion request - MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60, ///< TD solution infusion response + MSG_ID_UI_FLUID_BOLUS_REQUEST = 0x5F, ///< UI Fluid Bolus request + MSG_ID_TD_FLUID_BOLUS_RESPONSE = 0x60, ///< TD Fluid Bolus response MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62, ///< FP Inlet Pressure Check broadcast data MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63, ///< UI request to initiate a blood pressure reading @@ -490,11 +490,11 @@ REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13, ///< Treatment time change is less than minimum treatment time REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14, ///< Ultrafiltration is not currently in progress REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15, ///< Ultrafiltration is not currently paused - REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16, ///< A saline bolus is in progress + REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS = 16, ///< A fluid bolus is in progress REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED = 18, ///< Filter flush time has been expired REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 19, ///< Saline bolus volume maximum has been reached - no more saline allowed - REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 20, ///< A saline bolus is not in progress + REQUEST_REJECT_REASON_FLUID_BOLUS_NOT_IN_PROGRESS = 20, ///< A fluid bolus is not in progress REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 21, ///< Requested user action is disabled in current state REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 22, ///< Requested user action not allowed while alarm is active REQUEST_REJECT_REASON_INVALID_COMMAND = 23, ///< Requested user action invalid @@ -517,7 +517,7 @@ REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE = 40, ///< TD service is due REQUEST_REJECT_REASON_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 41, ///< RO filter temperature out of range REQUEST_REJECT_REASON_DD_INCOMPATIBLE = 42, ///< DD firmware version is not compatible with TD firmware - REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43, ///< Saline bolus is not allowed during dialyzer reprime + REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 43, ///< Fluid bolus is not allowed during dialyzer reprime REQUEST_REJECT_REASON_RO_ONLY_MODE_DD_BUSY = 44, ///< RO only mode DD is busy REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45, ///< RO only mode invalid parameter REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46, ///< RO only mode invalid payload length Index: TDDefs.h =================================================================== diff -u -rbf926947342bad2327352d878c681401a6b2d994 -rf621619a1a439b97d9744c34bf3ef317e4499cc5 --- TDDefs.h (.../TDDefs.h) (revision bf926947342bad2327352d878c681401a6b2d994) +++ TDDefs.h (.../TDDefs.h) (revision f621619a1a439b97d9744c34bf3ef317e4499cc5) @@ -386,24 +386,25 @@ }; typedef enum Dialysis_States DIALYSIS_STATE_T; ///< Type for dialysis states enumeration -/// Enumeration of saline bolus states. -enum Saline_Bolus_States +/// Enumeration of fluid bolus states. +enum Fluid_Bolus_States { - SALINE_BOLUS_STATE_IDLE = 0, ///< No saline bolus delivery is in progress - SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP, ///< Wait for pumps to stop before starting bolus - SALINE_BOLUS_STATE_IN_PROGRESS, ///< A saline bolus delivery is in progress - NUM_OF_SALINE_BOLUS_STATES ///< Number of saline bolus states + FLUID_BOLUS_IDLE_STATE = 0, ///< No fluid bolus delivery is in progress + FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE, ///< Wait for pumps to stop before starting bolus + FLUID_BOLUS_SALINE_IN_PROGRESS_STATE, ///< A saline bolus delivery is in progress + FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE, ///< A substitute bolus delivery is in progress + NUM_OF_FLUID_BOLUS_STATES ///< Number of fluid bolus states }; -typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T; ///< Type for saline bolus state enumeration +typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T; ///< Type for fluid bolus state enumeration -/// Enumeration of saline bolus command parameters. -enum Saline_Commands +/// Enumeration of fluid bolus command parameters. +enum Fluid_Bolus_Commands { - SALINE_CMD_STOP = 0, ///< Stop saline bolus command - SALINE_CMD_START, ///< Start saline bolus command - NUM_OF_SALINE_CMDS ///< Number of saline bolus command parameters + FLUID_BOLUS_CMD_STOP = 0, ///< Stop fluid bolus command + FLUID_BOLUS_CMD_START, ///< Start fluid bolus command + NUM_OF_FLUID_BOLUS_CMDS ///< Number of fluid bolus command parameters }; -typedef enum Saline_Commands SALINE_CMD_T; ///< Type for saline command enum. +typedef enum Fluid_Bolus_Commands FLUID_BOLUS_CMD_T; ///< Type for fluid bolus command enum. /// Enumeration of ultrafiltration command IDs. enum UF_Commands @@ -468,6 +469,7 @@ TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE, ///< Re-circulate Blood only state of the treatment paused sub-mode state machine TREATMENT_PAUSED_NO_RECIRC_STATE, ///< No re-circulation state of the treatment paused sub-mode state machine TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE, ///< Treatment paused recover blood detect state + TREATMENT_PAUSED_FLUID_BOLUS_STATE, ///< Fluid Bolus state of the treatment paused sub-mode state machine NUM_OF_TREATMENT_PAUSED_STATES ///< Number of treatment paused sub-mode states }; /// Type for treatment paused states enumeration. @@ -486,6 +488,7 @@ BLOOD_PRIME_RAMP_STATE = 0, ///< Ramp state of the blood prime sub-mode state machine BLOOD_PRIME_RUN_STATE, ///< Run state of the blood prime sub-mode state machine BLOOD_PRIME_PAUSED_STATE, ///< Paused state of the blood prime sub-mode state machine + BLOOD_PRIME_FLUID_BOLUS_STATE, ///< Fluid Bolus state of the blood prime sub-mode state machine NUM_OF_BLOOD_PRIME_STATES ///< Number of blood prime sub-mode states }; /// Type for treatment end states enumeration. @@ -746,7 +749,7 @@ HEPARIN_BOLUS_END_EVENT, ///< Heparin bolus end event HEPARIN_START_RESUME_EVENT, ///< Heparin start or resume event HEPARIN_STOP_PAUSE_EVENT, ///< Heparin stop or pause event - SALINE_BOLUSES_CHANGE_EVENT, ///< Saline boluses change event + FLUID_BOLUSES_CHANGE_EVENT, ///< Fluid boluses change event NUM_OF_TX_EVENT_IDS ///< Total number of treatment events }; typedef enum Tx_Event_List TX_EVENT_ID_T; ///< Type for treatment event list enumeration