Index: TDDefs.h =================================================================== diff -u -rb5fc952634ed740f8b4722945c6ad682fb53a3fb -r74900728e3729be88f2581bb2ff03a978b6a46cb --- TDDefs.h (.../TDDefs.h) (revision b5fc952634ed740f8b4722945c6ad682fb53a3fb) +++ TDDefs.h (.../TDDefs.h) (revision 74900728e3729be88f2581bb2ff03a978b6a46cb) @@ -8,7 +8,7 @@ * @file TDDefs.h * * @author (last) Praneeth Bunne -* @date (last) 21-May-2026 +* @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 }; @@ -113,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 * @{ */ @@ -381,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 @@ -467,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. @@ -485,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. @@ -582,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. @@ -637,6 +659,23 @@ }; 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 { @@ -745,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