Index: TDDefs.h =================================================================== diff -u -r33356d7f479c426e1602a9bcf0f74e9dd35f592d -rda175684273b1709b2ea70334cb7af7c3698d558 --- TDDefs.h (.../TDDefs.h) (revision 33356d7f479c426e1602a9bcf0f74e9dd35f592d) +++ TDDefs.h (.../TDDefs.h) (revision da175684273b1709b2ea70334cb7af7c3698d558) @@ -342,11 +342,14 @@ { TREATMENT_START_STATE = 0, ///< Start treatment - initialize treatment and go to blood prime state TREATMENT_BLOOD_PRIME_STATE, ///< Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed. No dialysis or UF taking place. No treatment time. - TREATMENT_DIALYSIS_STATE, ///< Perform dialysis. Deliver Heparin as prescribed. Deliver UF as prescribed. Handle saline boluses as requested - TREATMENT_STOP_STATE, ///< Treatment stopped. All pumps off. Dializer bypassed + TREATMENT_DIALYSIS_STATE, ///< Perform dialysis. Deliver UF as prescribed. + TREATMENT_PAUSED_STATE, ///< Treatment paused. All pumps off. Dializer bypassed TREATMENT_RINSEBACK_STATE, ///< Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating TREATMENT_RECIRC_STATE, ///< Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed TREATMENT_END_STATE, ///< Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback + TREATMENT_ISO_UF_STATE, ///< Isolated ultrafiltration. No dialysate flow. Ultrafiltration only. + TREATMENT_SALINE_BOLUS_STATE, ///< Deliver a saline bolus. Blood pump draws from saline bag. Dialyzer bypassed. + TREATMENT_DIALYSATE_PAUSED_STATE, ///< No dialysate flow. Dialyzer bypassed. NUM_OF_TREATMENT_STATES ///< Number of treatment states (sub-modes) }; typedef enum Treatment_States TREATMENT_STATE_T; ///< Type for treatment states enumeration @@ -394,22 +397,12 @@ /// Enumeration of dialysis sub-mode states. enum Dialysis_States { - DIALYSIS_START_STATE = 0, ///< Start state of the dialysis sub-mode state machine - DIALYSIS_UF_STATE, ///< Ultrafiltration state of the dialysis sub-mode state machine - DIALYSIS_SALINE_BOLUS_STATE, ///< Saline bolus state of the dialysis sub-mode state machine + 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 NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states }; typedef enum Dialysis_States DIALYSIS_STATE_T; ///< Type for dialysis states enumeration -/// Enumeration of ultrafiltration states. -enum UF_States -{ - UF_PAUSED_STATE = 0, ///< Paused state of the ultrafiltration state machine - UF_RUNNING_STATE, ///< Running state of the ultrafiltration state machine - NUM_OF_UF_STATES ///< Number of ultrafiltration states -}; -typedef enum UF_States UF_STATE_T; ///< Type for ultrafiltration states enumeration - /// Enumeration of saline bolus states. enum Saline_Bolus_States { @@ -485,18 +478,18 @@ * @{ */ -/// Enumeration of treatment stop sub-mode states. -enum Treatment_Stop_States +/// Enumeration of treatment paused sub-mode states. +enum Treatment_Paused_States { - TREATMENT_STOP_RECIRC_STATE = 0, ///< Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine - TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE, ///< Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine - TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE, ///< Re-circulate Blood only state of the treatment re-circulate sub-mode state machine - TREATMENT_STOP_NO_RECIRC_STATE, ///< No re-circulation state of the treatment stop sub-mode state machine - TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE, ///< Treatment stop recover blood detect state - NUM_OF_TREATMENT_STOP_STATES ///< Number of treatment stop sub-mode states + TREATMENT_PAUSED_RECIRC_STATE = 0, ///< Dialysate and Blood re-circulation state of the treatment paused sub-mode state machine + TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE, ///< Re-circulate Dialysate only state of the treatment paused sub-mode state machine + 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 + NUM_OF_TREATMENT_PAUSED_STATES ///< Number of treatment paused sub-mode states }; -/// Type for treatment stop states enumeration. -typedef enum Treatment_Stop_States TREATMENT_STOP_STATE_T; +/// Type for treatment paused states enumeration. +typedef enum Treatment_Paused_States TREATMENT_PAUSED_STATE_T; /**@}*/ @@ -624,24 +617,21 @@ TREATMENT_PARAM_FIRST_UINT = TREATMENT_PARAM_BLOOD_FLOW, ///< First unsigned integer treatment parameter TREATMENT_PARAM_DIALYSATE_FLOW, ///< Dialysate flow rate (in mL/min) TREATMENT_PARAM_TREATMENT_DURATION, ///< Treatment duration (in minutes) - TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME, ///< Heparin pre-stop time (in minutes) TREATMENT_PARAM_SALINE_BOLUS_VOLUME, ///< Saline bolus volume (in mL) TREATMENT_PARAM_ACID_CONCENTRATE, ///< Acid concentrate type (enum) TREATMENT_PARAM_BICARB_CONCENTRATE, ///< Bicarbonate concentrate type (enum) TREATMENT_PARAM_DIALYZER_TYPE, ///< Dialysate type (enum) - TREATMENT_PARAM_HEPARIN_TYPE, ///< Heparin type (enum) TREATMENT_PARAM_BP_MEAS_INTERVAL, ///< Blood pressure measurement interval (in minutes) TREATMENT_PARAM_RINSEBACK_FLOW_RATE, ///< Rinseback flow rate (in mL/min) TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_FLOW_RATE, ///< 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_LAST_INT = TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC,///< Last integer treatment parameter - TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, ///< Heparin dispense rate (in mL/hr) - TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, ///< First floating point treatment parameter - TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, ///< Heparin bolus volume (in mL) + 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_UF_VOLUME, ///< Ultrafiltration volume (in liters) - provided separately by UI NUM_OF_TREATMENT_PARAMS ///< Total number of treatment parameters };