Index: TDDefs.h =================================================================== diff -u -r413aa187b32921babc077451fb7c98578707497b -r74900728e3729be88f2581bb2ff03a978b6a46cb --- TDDefs.h (.../TDDefs.h) (revision 413aa187b32921babc077451fb7c98578707497b) +++ TDDefs.h (.../TDDefs.h) (revision 74900728e3729be88f2581bb2ff03a978b6a46cb) @@ -7,8 +7,8 @@ * * @file TDDefs.h * -* @author (last) Varshini Nagabooshanam -* @date (last) 10-Mar-2026 +* @author (last) Praneeth Bunne +* @date (last) 04-Jun-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -35,6 +35,7 @@ MODE_PRET, ///< Pre-Treatment mode MODE_TREA, ///< Treatment mode MODE_POST, ///< Post-Treatment mode + MODE_UPDT, ///< Update mode MODE_NLEG, ///< Not legal - an illegal mode transition occurred NUM_OF_MODES ///< Number of TD operation modes }; @@ -66,6 +67,7 @@ POST_STATE_STUCK_BUTTON, ///< Run stuck button test state POST_STATE_UI_POST, ///< Check whether UI passed its POST tests POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state + POST_STATE_EJECTOR_HOMING, ///< Run ejector homing POST state POST_STATE_FPGA, ///< Run FPGA test state POST_STATE_COMPLETED, ///< POST self-tests completed state POST_STATE_FAILED, ///< POST self-tests failed state @@ -112,6 +114,22 @@ /**@}*/ /** + * @addtogroup TDUpdateMode + * @{ + */ + +/// Sub-mode states while in update mode +enum TD_Update_States +{ + TD_UPDATE_INIT_STATE = 0, ///< Start update state. + TD_UPDATE_RESET_MCU_STATE, ///< Reset MCU state. + NUM_OF_TD_UPDATE_STATES ///< Number of update states (sub-modes). +}; +typedef enum TD_Update_States TD_UPDATE_STATE_T; ///< Type for TD update states enumeration + +/**@}*/ + +/** * @addtogroup TDPreTreatmentMode * @{ */ @@ -122,7 +140,7 @@ TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0, ///< Water sample state TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, ///< Consumable self-tests state TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE, ///< No cartridge self-tests state - TD_PRE_TREATMENT_CART_INSTALL_STATE, ///< Consumable and cartridge installation state + TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE, ///< Tube set install state TD_PRE_TREATMENT_SELF_TEST_DRY_STATE, ///< Self-tests when the cartridge is dry state TD_PRE_TREATMENT_PRIME_STATE, ///< Prime blood and dialysate circuits and run wet self-tests state TD_PRE_TREATMENT_RECIRCULATE_STATE, ///< Re-circulate blood and dialysate circuits state @@ -206,24 +224,22 @@ /// Enumeration of dry self-tests sub-mode states. enum TD_Pre_Treatment_Dry_Self_Tests_States { - DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests starting state - DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to close before executing self-tests - DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check dry self-test state - DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check dry self-test state - DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE, ///< Seek syringe pumps state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE, ///< Pressure sensor setup state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE, ///< Venous pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS, ///< Venous pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE, ///< Arterial pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL, ///< Arterial pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE, ///< Pressure sensors verify pressure loss state - DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE, ///< Pressure sensors verify pressure stability state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE, ///< Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE, ///< Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE, ///< Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE, ///< Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states + DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0, ///< Wait for door close state + DRY_SELF_TESTS_USED_TUBING_SET_CHECK_STATE, ///< Used tube set check state + DRY_SELF_TESTS_TUBING_SET_LOADED_CHECK_STATE, ///< Tube set loaded check state + DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE, ///< Tube set authentication state + DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE, ///< Pressure sensor normal setup state + DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE, ///< Pressure venous setup state + DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE, ///< Venous pressure stabilization state + DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE, ///< Venous pressure leak check state + DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE, ///< Venous pressure relief state + DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE, ///< Pressure arterial setup state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE, ///< Arterial pressure stabilization state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE, ///< Arterial pressure leak check state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE, ///< Arterial pressure relief state + DRY_SELF_TESTS_COMPLETE_STATE, ///< Complete state + DRY_SELF_TESTS_STOPPED_STATE, ///< Stopped state + NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states }; /// Type for dry self-tests enumeration. typedef enum TD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T; @@ -347,8 +363,8 @@ /// Enumeration of post-treatment mode states. enum TD_Post_Treatment_Mode_States { - TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0, ///< Drain reservoirs state - TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, ///< Patient disconnection state + TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0, ///< Patient disconnection state + TD_POST_TREATMENT_AUTO_EJECT_STATE, ///< Auto eject state TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE, ///< Disposable removal state TD_POST_TREATMENT_VERIFY_STATE, ///< Verify cartridge removed, syringe removed, and reservoirs drained state NUM_OF_TD_POST_TREATMENT_STATES ///< Number of post-treatment mode states @@ -382,28 +398,30 @@ { DIALYSIS_UF_STATE = 0, ///< Ultrafiltration state of the dialysis sub-mode state machine DIALYSIS_UF_PAUSED_STATE, ///< Ultrafiltration Paused state of the dialysis sub-mode state machine + DIALYSIS_UF_FLUID_BOLUS_STATE, ///< Fluid Bolus state of the dialysis sub-mode state machine NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states }; 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 +486,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 +505,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. @@ -583,6 +603,7 @@ { TREATMENT_END_WAIT_FOR_RINSEBACK_STATE = 0, ///< Wait for rinseback state of the treatment end sub-mode state machine TREATMENT_END_PAUSED_STATE, ///< Paused state of the treatment end sub-mode state machine + TREATMENT_END_FLUID_BOLUS_STATE, ///< Fluid Bolus state of the treatment end sub-mode state machine NUM_OF_TREATMENT_END_STATES ///< Number of treatment end sub-mode states }; /// Type for treatment end states enumeration. @@ -607,35 +628,116 @@ /// Enumeration of treatment parameters. enum Treatment_Params { - TREATMENT_PARAM_BLOOD_FLOW = 0, ///< Blood flow rate (in mL/min) - TREATMENT_PARAM_FIRST_UINT = TREATMENT_PARAM_BLOOD_FLOW, ///< First unsigned integer treatment parameter + TREATMENT_PARAM_TREATMENT_MODALITY = 0, ///< Treatment modality type (enum) + TREATMENT_PARAM_FIRST_UINT = TREATMENT_PARAM_TREATMENT_MODALITY, ///< First unsigned integer treatment parameter + TREATMENT_PARAM_HDF_DILUTION, ///< HDF dilution (enum) + TREATMENT_PARAM_BLOOD_FLOW, ///< Blood flow rate (in mL/min) TREATMENT_PARAM_DIALYSATE_FLOW, ///< Dialysate flow rate (in mL/min) TREATMENT_PARAM_TREATMENT_DURATION, ///< Treatment duration (in minutes) - TREATMENT_PARAM_SALINE_BOLUS_VOLUME, ///< Saline bolus volume (in mL) - TREATMENT_PARAM_HEPARIN_STOP_TIME, ///< Heparin stop time (in minutes) + TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION, ///< Heparin delivery duration (in minutes) TREATMENT_PARAM_HEPARIN_TYPE, ///< Heparin type (enum) - TREATMENT_PARAM_ACID_CONCENTRATE, ///< Acid concentrate type (enum) - TREATMENT_PARAM_BICARB_CONCENTRATE, ///< Bicarbonate concentrate type (enum) + TREATMENT_PARAM_DRY_BICARB_CART_SIZE, ///< Dry bicarb cartrideg size (enum) + TREATMENT_PARAM_SODIUM, ///< Sodium concentrate (mEq/L) + TREATMENT_PARAM_BICARBONATE, ///< Bicarbonate concentrate (mEq/L) TREATMENT_PARAM_DIALYZER_TYPE, ///< Dialysate type (enum) + TREATMENT_PARAM_FLUID_BOLUS_VOLUME, ///< Fluid bolus volume (in mL) TREATMENT_PARAM_BP_MEAS_INTERVAL, ///< Blood pressure measurement interval (in minutes) - TREATMENT_PARAM_RINSEBACK_FLOW_RATE, ///< Rinseback flow rate (in mL/min) - TREATMENT_PARAM_RINSEBACK_VOLUME, ///< Rinseback volume (in mL) - TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_VOLUME, ///< Last unsigned integer treatment parameter - TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, ///< Arterial pressure alarm limit window (in mmHg) - TREATMENT_PARAM_FIRST_INT = TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, ///< First integer treatment parameter - TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, ///< Venous pressure alarm limit window (in mmHg) - TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC, ///< Venous pressure alarm limit asymmetric (in mmHg) - TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW, ///< TMP alarm limit window (in mmHg) - TREATMENT_PARAM_LAST_INT = TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW, ///< Last integer treatment parameter - TREATMENT_PARAM_DIALYSATE_TEMPERATURE, ///< Dialysate temperature (in degC) - TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_DIALYSATE_TEMPERATURE, ///< First floating point treatment parameter - TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, ///< Heparin dispense rate (in mL/hr) + TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME, ///< Prime rinseback volume (in mL) + TREATMENT_PARAM_HEPATITIS_B, ///< Hepatitis B status (enum) + TREATMENT_PARAM_ACID_CONCENTRATE, ///< Acid concentrate type (enum) + TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_ACID_CONCENTRATE, ///< Last unsigned integer treatment parameter + TREATMENT_PARAM_SUBST_FLUID_VOLUME, ///< Substitution fluid volume (in liters) + TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_SUBST_FLUID_VOLUME, ///< First floating point treatment parameter TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, ///< Heparin bolus volume (in mL) + TREATMENT_PARAM_HEPARIN_DELIVERY_RATE, ///< Heparin delivery rate (in mL/hr) + TREATMENT_PARAM_DIALYSATE_TEMPERATURE, ///< Dialysate temperature (in degC) + TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR, ///< Acid concentrate conversion factor + TREATMENT_PARAM_PRE_WEIGHT, ///< Weight of patient prior to treatment + TREATMENT_PARAM_EST_TARGET_WEIGHT, ///< Estimated target weight of patient post treatment TREATMENT_PARAM_UF_VOLUME, ///< Ultrafiltration volume (in liters) - provided separately by UI NUM_OF_TREATMENT_PARAMS ///< Total number of treatment parameters }; typedef enum Treatment_Params TREATMENT_PARAM_T; ///< Type for treatment parameters enumeration +/// Enumeration of treatment set point parameter indices. +enum Treatment_Setpoint_Params +{ + TREATMENT_SETPOINT_BLOOD_FLOW = 0, ///< Blood flow rate (in mL/min) + TREATMENT_SETPOINT_DIALYSATE_FLOW, ///< Dialysate flow rate (in mL/min) + TREATMENT_SETPOINT_DIALYSATE_TEMPERATURE, ///< Dialysate temperature (in degC) + TREATMENT_SETPOINT_ACID_CONCENTRATE, ///< Acid concentrate type (enum) + TREATMENT_SETPOINT_ACID_CONVERSION_FACTOR, ///< Acid concentrate conversion factor + TREATMENT_SETPOINT_BICARB_CONCENTRATE, ///< Bicarbonate concentrate type (enum) + TREATMENT_SETPOINT_TREATMENT_MODALITY, ///< Treatment modality type (enum) + TREATMENT_SETPOINT_HEPATITIS_STATUS, ///< Hepatitis B status (enum) + TREATMENT_SETPOINT_SODIUM, ///< Sodium concentration (mEq/L) + TREATMENT_SETPOINT_BICARBONATE, ///< Bicarbonate concentration (mEq/L) + NUM_OF_TREATMENT_SETPOINT_PARAMS ///< Total number of treatment set point parameters +}; +typedef enum Treatment_Setpoint_Params TREATMENT_SETPOINT_PARAM_T; ///< Type for treatment set point parameter indices enumeration + +/// Enumeration of system configured treatment parameters. +enum System_Config_Treatment_Params +{ + TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW = 0, ///< Arterial pressure alarm limit window (in mmHg) + TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, ///< Venous pressure alarm limit window (in mmHg) + TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC, ///< Venous pressure alarm limit asymmetric (in mmHg) + TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW, ///< TMP pressure alarm limit window (in mmHg) + TREATMENT_PARAM_RINSEBACK_FLOW_RATE, ///< Rinseback flow rate (in mL/min) + TREATMENT_PARAM_PRIME_DISCARD_VOLUME, ///< Prime discard volume (in mL) + TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT, ///< Systolic BP low alarm limit (in mmHg) + TREATMENT_PARAM_SYSTOLIC_BP_HIGH_ALARM_LIMIT, ///< Systolic BP high alarm limit (in mmHg) + TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT, ///< Heart rate low alarm limit (BPM) + TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT, ///< Heart rate high alarm limit (BPM) + TREATMENT_PARAM_PRES_ALARM_PERSISTENCE, ///< Pressure alarms persistence (seconds) + NUM_OF_SYS_CONFIG_TREATMENT_PARAMS ///< Total number of treatment parameters +}; +typedef enum System_Config_Treatment_Params SYS_CONFIG_TREATMENT_PARAM_T; ///< Type for system configured treatment parameters enumeration + +/// Enumeration of treatment modality type +enum Treatment_Modality_Types +{ + TREATMENT_MODALITY_HD = 0, ///< Treatment modality Hemodialysis + TREATMENT_MODALITY_HDF, ///< Treatment modality Hemodiafiltration +// TREATMENT_MODALITY_ISOLATED_UF, ///< Treatment modality Isolated UF // TODO uncomment in phase 3 when ISO UF feature is required + NUM_OF_TREATMENT_MODALITY_TYPES ///< Total number of treatment modality types +}; +typedef enum Treatment_Modality_Types TREATMENT_TYPE_T; ///< Type for treatment modality type enumeration + +/// Enumeration of HDF dilution +enum HDF_Dilution +{ + HDF_NOT_APPLICABLE = 0, ///< Treatment HDF not applicable + HDF_PRE_DILUTION, ///< Treatment HDF pre-dilution + HDF_POST_DILUTION, ///< Treatment HDF post-dilution + NUM_OF_TREATMENT_HDF_TYPES ///< Total number of HDF modes +}; +typedef enum HDF_Dilution HDF_MODE_T; ///< Type for HDF treatment dilution enumeration + +/// Enumeration of dry bicarb cartridge size. +enum Dry_Bicarb_Cart_Size +{ + DRY_BICARB_650_G = 0, ///< Dry bicarb cartridge of size 650 g + DRY_BICARB_720_G, ///< Dry bicarb cartridge of size 720 g + DRY_BICARB_760_G, ///< Dry bicarb cartridge of size 760 g + DRY_BICARB_900_G, ///< Dry bicarb cartridge of size 900 g + DRY_BICARB_1100_G, ///< Dry bicarb cartridge of size 1100 g + DRY_BICARB_1250_G, ///< Dry bicarb cartridge of size 1250 g + NUM_OF_DRY_BICARB_CART_SIZES ///< Number of dry bicarb cartridge sizes +}; +typedef enum Dry_Bicarb_Cart_Size DRY_BICARB_CART_SIZE_T; ///< Type for dry bicarb cartridge size enumeration + +/// Enumeration of Hepatitis B Status +enum Hepatitis_B_Status +{ + HEPATITIS_B_NOT_APPLICABLE = 0, ///< Hepatitis B status not applicable + HEPATITIS_B_UNKNOWN, ///< Hepatitis B status unknowm + HEPATITIS_B_POSITIVE, ///< Hepatitis B status positive + HEPATITIS_B_NEGATIVE, ///< Hepatitis B status negative + NUM_OF_HEPATITIS_B_STATUS ///< Total number of Hepatitis status types +}; +typedef enum Hepatitis_B_Status HEPATITIS_B_STATUS_T; ///< Type for hepatitis B status enumeration + /// Enumeration of dialyzer types. enum Dialyzer_Types { @@ -650,24 +752,6 @@ }; typedef enum Dialyzer_Types DIALYZER_TYPE_T; ///< Type for dialyzer types enumeration -/// Enumeration of acid concentrates. -enum Acid_Concentrates -{ - ACID_CONC_TYPE_FRESENIUS_08_1251_1 = 0, ///< Fresensius Naturalyte Acid Concentrate 08-1251-1 - ACID_CONC_TYPE_FRESENIUS_08_2251_0, ///< Fresensius Naturalyte Acid Concentrate 08-2251-0 - ACID_CONC_TYPE_FRESENIUS_08_3251_9, ///< Fresensius Naturalyte Acid Concentrate 08-3251-9 - NUM_OF_ACID_CONC_TYPES ///< Number of acid concentrates -}; -typedef enum Acid_Concentrates ACID_CONCENTRATE_TYPE_T; ///< Type for acid concentrates enumeration - -/// Enumeration of bicarbonate concentrates. -enum Bicarb_Concentrates -{ - BICARB_CONC_TYPE_FRESENIUS_CENTRISOL = 0, ///< Fresenius Centrisol Liquid Bicarbonate - NUM_OF_BICARB_CONC_TYPES ///< Number of bicarbonate concentrates -}; -typedef enum Bicarb_Concentrates BICARB_CONCENTRATE_TYPE_T; ///< Type for bicarbonate concentrates enumeration - /// Enumeration of Heparin types. enum Heparin_Types { @@ -700,7 +784,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 @@ -718,7 +802,9 @@ TD_EVENT_STARTUP = 0, ///< TD startup event TD_EVENT_OP_MODE_CHANGE, ///< TD Op mode change event TD_EVENT_SUB_MODE_CHANGE, ///< TD Op sub-mode change event - TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< TD dry self test cartridge result + TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT, ///< TD dry self test cartridge result + TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST, ///< TD tubing set barcode scan request + TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED, ///< TD tubing set barcode scan authenticated TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< TD dry self test pressure result TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< TD wet self test displacement result TD_EVENT_CPU_RAM_ERROR_STATUS, ///< TD CPU RAM error status @@ -735,10 +821,10 @@ TD_EVENT_AIR_TRAP_FILL, ///< TD started/stopped an air trap fill operation. TD_EVENT_AIR_TRAP_LOWER, ///< TD started/stopped an air trap lower level operation. TD_EVENT_AIR_PUMP_ON_OFF, ///< TD turned air pump on/off. - TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD, ///< TD dry self test pressure decay waiting period. TD_EVENT_INSTIT_RECORD_UPDATE, ///< TD new institutional record has been updated. TD_EVENT_VALVE_POS_CHANGE, ///< TD pinch valve position change TD_EVENT_VALVE_HOMED_POS_SETTING, ///< TD pinch valve homed encoder positions for A/B/C. + TD_EVENT_SYRINGE_PUMP_STATE, ///< TD syringe pump state change event NUM_OF_TD_EVENT_IDS ///< Total number of TD events }; typedef enum TD_Event_List TD_EVENT_ID_T; ///< Type for TD event list enumeration