Index: HDDefs.h =================================================================== diff -u -rbecfbc4d11de64248085cde7f064d4e1cf63f978 -rd2b33b8d231f0c8439db5973bc67238f8dde79bf --- HDDefs.h (.../HDDefs.h) (revision becfbc4d11de64248085cde7f064d4e1cf63f978) +++ HDDefs.h (.../HDDefs.h) (revision d2b33b8d231f0c8439db5973bc67238f8dde79bf) @@ -7,65 +7,64 @@ * * @file HDDefs.h * -* @author (last) Dara Navaei -* @date (last) 05-Feb-2022 +* @author (last) Sean Nash +* @date (last) 02-Aug-2022 * * @author (original) Sean Nash * @date (original) 29-May-2020 * ***************************************************************************/ - -#ifndef __HD_DEFS_H__ -#define __HD_DEFS_H__ - -// ********** public definitions ********** - -/** - * @addtogroup HDOperationModes - * @{ - */ - -/// Enumeration of operation modes. These are in order of priority (highest to lowest). -enum HD_Op_Modes -{ - MODE_FAUL = 0, ///< Fault mode - MODE_SERV, ///< Service mode - MODE_INIT, ///< Initialization & POST mode - MODE_STAN, ///< Standby mode - MODE_TPAR, ///< Treatment Parameters mode - MODE_PRET, ///< Pre-Treatment mode - MODE_TREA, ///< Treatment mode - MODE_POST, ///< Post-Treatment mode - MODE_NLEG, ///< Not legal - an illegal mode transition occurred - NUM_OF_MODES ///< Number of HD operation modes -}; -typedef enum HD_Op_Modes HD_OP_MODE_T; ///< Type for HD operation modes enumeration - -/**@}*/ - -/** - * @addtogroup HDInitAndPOSTMode - * @{ - */ - -/// Enumeration of init & POST mode states. -enum HD_POST_States -{ + +#ifndef __HD_DEFS_H__ +#define __HD_DEFS_H__ + +// ********** public definitions ********** + +/** + * @addtogroup HDOperationModes + * @{ + */ + +/// Enumeration of operation modes. These are in order of priority (highest to lowest). +enum HD_Op_Modes +{ + MODE_FAUL = 0, ///< Fault mode + MODE_SERV, ///< Service mode + MODE_INIT, ///< Initialization & POST mode + MODE_STAN, ///< Standby mode + MODE_TPAR, ///< Treatment Parameters mode + MODE_PRET, ///< Pre-Treatment mode + MODE_TREA, ///< Treatment mode + MODE_POST, ///< Post-Treatment mode + MODE_NLEG, ///< Not legal - an illegal mode transition occurred + NUM_OF_MODES ///< Number of HD operation modes +}; +typedef enum HD_Op_Modes HD_OP_MODE_T; ///< Type for HD operation modes enumeration + +/**@}*/ + +/** + * @addtogroup HDInitAndPOSTMode + * @{ + */ + +/// Enumeration of init & POST mode states. +enum HD_POST_States +{ POST_STATE_START = 0, ///< Start initialize & POST mode state POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state - POST_STATE_AC, ///< Check HD has AC power - power off if not - POST_STATE_WATCHDOG, ///< Run watchdog test state + POST_STATE_WATCHDOG, ///< Run watchdog test state POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state - POST_STATE_RTC, ///< Run RTC test state - POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state - POST_STATE_BLOOD_FLOW, ///< Run blood flow test state + POST_STATE_RTC, ///< Run RTC test state + POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state + POST_STATE_BLOOD_FLOW, ///< Run blood flow test state POST_STATE_DIALYSATE_INLET_FLOW, ///< Run dialysate inlet flow test state POST_STATE_DIALYSATE_OUTLET_FLOW, ///< Run dialysate outlet flow test state - POST_STATE_BLOOD_LEAK, ///< Run blood leak sensor test state + POST_STATE_BLOOD_LEAK, ///< Run blood leak sensor test state POST_STATE_VALVES, ///< Run valves test state POST_STATE_SYRINGE_PUMP, ///< Run syringe pump test state POST_STATE_PRES_OCCL, ///< Run pressure occlusion state - POST_STATE_ALARM_AUDIO, ///< Run alarm audio test state + POST_STATE_ALARM_AUDIO, ///< Run alarm audio test state POST_STATE_ALARM_LAMP, ///< Run alarm lamp test state POST_STATE_ACCELEROMETER, ///< Run Accelerometer test state POST_STATE_TEMPERATURES, ///< Run temperatures POST state @@ -74,74 +73,83 @@ POST_STATE_UI_POST, ///< Check whether UI passed its POST tests POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state POST_STATE_FPGA, ///< Run FPGA test state - POST_STATE_COMPLETED, ///< POST self-tests completed state - POST_STATE_FAILED, ///< POST self-tests failed state - NUM_OF_POST_STATES ///< Number of initialize & POST mode states -}; -typedef enum HD_POST_States HD_POST_STATE_T; ///< Type for HD POST states enumeration - -/**@}*/ - -/** - * @addtogroup HDFaultMode - * @{ - */ - -/// Enumeration of fault mode states. -enum HD_Fault_States -{ - HD_FAULT_STATE_START = 0, ///< Start fault state - NUM_OF_HD_FAULT_STATES ///< Number of fault mode states -}; -typedef enum HD_Fault_States HD_FAULT_STATE_T; ///< Type for HD fault states enumeration - -/**@}*/ - -/** - * @addtogroup HDStandbyMode - * @{ - */ - -/// Sub-mode states while in standby mode -enum HD_Standby_States -{ - STANDBY_START_STATE = 0, ///< Start standby - STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment - STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option - STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress - STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress - STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress - NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) -}; -typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration + POST_STATE_COMPLETED, ///< POST self-tests completed state + POST_STATE_FAILED, ///< POST self-tests failed state + NUM_OF_POST_STATES ///< Number of initialize & POST mode states +}; +typedef enum HD_POST_States HD_POST_STATE_T; ///< Type for HD POST states enumeration -/**@}*/ - -/** - * @addtogroup HDTreatmentParamsMode - * @{ - */ - -/// Enumeration of treatment parameters mode states. -enum HD_Treatment_Parameters_Mode_States -{ +/**@}*/ + +/** + * @addtogroup HDFaultMode + * @{ + */ + +/// Enumeration of fault mode states. +enum HD_Fault_States +{ + HD_FAULT_STATE_START = 0, ///< Start fault state + NUM_OF_HD_FAULT_STATES ///< Number of fault mode states +}; +typedef enum HD_Fault_States HD_FAULT_STATE_T; ///< Type for HD fault states enumeration + +/**@}*/ + +/** + * @addtogroup HDStandbyMode + * @{ + */ + +/// Sub-mode states while in standby mode +enum HD_Standby_States +{ + STANDBY_START_STATE = 0, ///< Start standby (home actuators). + STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment. + STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option. + + STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG flush command response. + STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE, ///< Wait for DG flush to start. + STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress + + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG heat disinfect command response. + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE, ///< Wait for DG heat disinfect to start. + STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress. + + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect command response. + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE, ///< Wait for DG chemical disinfect to start. + STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress + NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) +}; +typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration + +/**@}*/ + +/** + * @addtogroup HDTreatmentParamsMode + * @{ + */ + +/// Enumeration of treatment parameters mode states. +enum HD_Treatment_Parameters_Mode_States +{ HD_TREATMENT_PARAMS_MODE_STATE_START = 0, ///< Start treatment params mode state HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND, ///< Wait for UI to send treatment params mode state HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM, ///< Wait for UI to confirm treatment params mode state - NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES ///< Number of treatment params mode states -}; -typedef enum HD_Treatment_Parameters_Mode_States HD_TREATMENT_PARAMS_MODE_STATE_T; ///< Type for HD treatment parameters mode states enumeration - -/**@}*/ - -/** - * @addtogroup HDPreTreatmentMode - * @{ - */ - -/// Enumeration of pre-treatment mode states (sub-mode). -enum HD_Pre_Treatment_Mode_States -{ + NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES ///< Number of treatment params mode states +}; +typedef enum HD_Treatment_Parameters_Mode_States HD_TREATMENT_PARAMS_MODE_STATE_T; ///< Type for HD treatment parameters mode states enumeration + +/**@}*/ + +/** + * @addtogroup HDPreTreatmentMode + * @{ + */ + +/// Enumeration of pre-treatment mode states (sub-mode). +enum HD_Pre_Treatment_Mode_States +{ HD_PRE_TREATMENT_START_STATE = 0, ///< Start pre-treatment mode state HD_PRE_TREATMENT_WATER_SAMPLE_STATE, ///< Water sample state HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, ///< Consumable self-tests state @@ -151,8 +159,8 @@ HD_PRE_TREATMENT_PRIME_STATE, ///< Prime blood and dialysate circuits and run wet self-tests state HD_PRE_TREATMENT_RECIRCULATE_STATE, ///< Re-circulate blood and dialysate circuits state HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE, ///< Patient connection state - NUM_OF_HD_PRE_TREATMENT_STATES ///< Number of pre-treatment mode states -}; + NUM_OF_HD_PRE_TREATMENT_STATES ///< Number of pre-treatment mode states +}; typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T; ///< Type for HD pre-treatment mode states enumeration /**@}*/ @@ -216,10 +224,7 @@ { NO_CART_SELF_TESTS_START_STATE = 0, ///< No cartridge self-tests starting state NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to be closed before running self-tests - NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< No cartridge occlusion sensors self-test state - NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE, ///< No cartridge blood flow meter self-test state - NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE, ///< No cartridge dialysate flow meter self-test state - NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state + NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE, ///< No cartridge pressure sensors self-test state NO_CART_SELF_TESTS_HOME_VALVES_STATE, ///< No cartridge home valves state NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE, ///< No cartridge home syringe pump state NO_CART_SELF_TESTS_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state @@ -249,9 +254,30 @@ }; /// Type for dry self-tests enumeration. typedef enum HD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T; - -/**@}*/ +/// Wet self-tests state machine. +enum Wet_Self_Tests_States +{ + WET_SELF_TESTS_START_STATE = 0, ///< Wet self-tests starting state. + WET_SELF_TESTS_SETUP_STATE, ///< Setup reservoirs for wet self-tests. + WET_SELF_TESTS_BUBBLES_STATE, ///< Wet self-test air bubble detectors state. + WET_SELF_TESTS_PRIME_CHECK_STATE, ///< Prime check wet self-tests state, checks for primed patient lines. + WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE, ///< Blood leak detector self-test state. + WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE, ///< Setup valve and start dialysate pump for first displacement. + WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE, ///< Fill reservoir 2 with 100 mL of dialysate from reservoir 1 state. + WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE, ///< After first displacement completed verify state. + WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE, ///< Setup valve and start dialysate pump for second displacement. + WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE, ///< Fill reservoir 1 with 300 mL of dialysate from reservoir 2 state. + WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE, ///< After first displacement completed verify state. + WET_SELF_TESTS_STOPPED_STATE, ///< Wet self-test stopped state. + WET_SELF_TESTS_COMPLETE_STATE, ///< Wet self-test complete state. + NUM_OF_WET_SELF_TESTS_STATES ///< Number of wet self-tests states. +}; +/// Type for wet self-tests enumeration. +typedef enum Wet_Self_Tests_States WET_SELF_TESTS_STATE_T; + +/**@}*/ + /** * @addtogroup Prime * @{ @@ -296,84 +322,84 @@ typedef enum HD_Pre_Treatment_Recirc_States HD_PRE_TREATMENT_RECIRC_STATE_T; /**@}*/ - -/** - * @addtogroup HDTreatmentMode - * @{ - */ - -/// Sub-mode states while in treatment mode -enum Treatment_States -{ + +/** + * @addtogroup HDTreatmentMode + * @{ + */ + +/// Sub-mode states while in treatment mode +enum Treatment_States +{ 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_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 - NUM_OF_TREATMENT_STATES ///< Number of treatment states (sub-modes) -}; -typedef enum Treatment_States TREATMENT_STATE_T; ///< Type for treatment states enumeration - -/**@}*/ - -/** - * @addtogroup HDPostTreatmentMode - * @{ - */ - -/// Enumeration of post-treatment mode states. -enum HD_Post_Treatment_Mode_States + 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_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 + NUM_OF_TREATMENT_STATES ///< Number of treatment states (sub-modes) +}; +typedef enum Treatment_States TREATMENT_STATE_T; ///< Type for treatment states enumeration + +/**@}*/ + +/** + * @addtogroup HDPostTreatmentMode + * @{ + */ + +/// Enumeration of post-treatment mode states. +enum HD_Post_Treatment_Mode_States { HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0, ///< Drain reservoirs state HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE, ///< Patient disconnection state HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE, ///< Disposable removal state - HD_POST_TREATMENT_VERIFY_STATE, ///< Verify cartridge removed, syringe removed, and reservoirs drained state - NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states -}; -typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T; ///< Type for HD post treatment mode states enumeration - -/**@}*/ - -/** - * @addtogroup HDServiceMode - * @{ - */ - -/// Enumeration of service mode states. -enum HD_Service_States -{ - HD_SERVICE_STATE_START = 0, ///< Start service mode state - NUM_OF_HD_SERVICE_STATES ///< Number of service mode states -}; -typedef enum HD_Service_States HD_SERVICE_STATE_T; ///< Type for HD services states enumeration - -/**@}*/ - -/** - * @addtogroup Dialysis - * @{ - */ - -/// 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 - 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_START_STATE = 0, ///< Start state of the ultrafiltration state machine - UF_PAUSED_STATE, ///< 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 -}; + HD_POST_TREATMENT_VERIFY_STATE, ///< Verify cartridge removed, syringe removed, and reservoirs drained state + NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states +}; +typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T; ///< Type for HD post treatment mode states enumeration + +/**@}*/ + +/** + * @addtogroup HDServiceMode + * @{ + */ + +/// Enumeration of service mode states. +enum HD_Service_States +{ + HD_SERVICE_STATE_START = 0, ///< Start service mode state + NUM_OF_HD_SERVICE_STATES ///< Number of service mode states +}; +typedef enum HD_Service_States HD_SERVICE_STATE_T; ///< Type for HD services states enumeration + +/**@}*/ + +/** + * @addtogroup Dialysis + * @{ + */ + +/// 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 + 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_START_STATE = 0, ///< Start state of the ultrafiltration state machine + UF_PAUSED_STATE, ///< 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. @@ -385,8 +411,8 @@ SALINE_BOLUS_STATE_MAX_DELIVERED, ///< Maximum saline bolus volume reached - no more saline bolus deliveries allowed NUM_OF_SALINE_BOLUS_STATES ///< Number of saline bolus states }; -typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T; ///< Type for saline bolus state enumeration - +typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T; ///< Type for saline bolus state enumeration + /// Enumeration of saline bolus command parameters. enum Saline_Commands { @@ -396,24 +422,24 @@ }; typedef enum Saline_Commands SALINE_CMD_T; ///< Type for saline command enum. -/// Enumeration of ultrafiltration command IDs. -enum UF_Commands -{ - UF_CMD_PAUSE = 0, ///< Pause UF command - UF_CMD_RESUME, ///< Resume UF command - NUM_OF_UF_CMDS ///< Number of UF commands -}; -typedef enum UF_Commands UF_CMD_T; ///< Type for UF command IDs enumeration - -/// Enumeration of ultrafiltration adjustment option IDs. -enum UF_Adjustments -{ - UF_ADJ_TREATMENT_TIME = 0, ///< Adjust treatment time to achieve new ultrafiltration volume - UF_ADJ_UF_RATE, ///< Adjust UF rate to achieve new ultrafiltration volume - NUM_OF_UF_ADJS ///< Number of UF adjustments -}; -typedef enum UF_Adjustments UF_ADJ_T; ///< Type for UF adjustments IDs enumeration - +/// Enumeration of ultrafiltration command IDs. +enum UF_Commands +{ + UF_CMD_PAUSE = 0, ///< Pause UF command + UF_CMD_RESUME, ///< Resume UF command + NUM_OF_UF_CMDS ///< Number of UF commands +}; +typedef enum UF_Commands UF_CMD_T; ///< Type for UF command IDs enumeration + +/// Enumeration of ultrafiltration adjustment option IDs. +enum UF_Adjustments +{ + UF_ADJ_TREATMENT_TIME = 0, ///< Adjust treatment time to achieve new ultrafiltration volume + UF_ADJ_UF_RATE, ///< Adjust UF rate to achieve new ultrafiltration volume + NUM_OF_UF_ADJS ///< Number of UF adjustments +}; +typedef enum UF_Adjustments UF_ADJ_T; ///< Type for UF adjustments IDs enumeration + /**@}*/ /** @@ -454,8 +480,10 @@ /// Enumeration of treatment stop sub-mode states. enum Treatment_Stop_States { - TREATMENT_STOP_RECIRC_STATE = 0, ///< Dialysate re-circulation state of the treatment stop sub-mode state machine - TREATMENT_STOP_NO_RECIRC_STATE, ///< No dialysate re-circulation state of the treatment stop sub-mode state machine + 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 NUM_OF_TREATMENT_STOP_STATES ///< Number of treatment stop sub-mode states }; /// Type for treatment stop states enumeration. @@ -524,7 +552,7 @@ /// Enumeration of treatment re-circulation sub-mode states. enum Treatment_Recirc_States { - TREATMENT_RECIRC_RECIRC_STATE = 0, ///< Re-circulate state of the treatment re-circulate sub-mode state machine + TREATMENT_RECIRC_RECIRC_STATE = 0, ///< Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine TREATMENT_RECIRC_STOPPED_STATE, ///< Stopped state of the treatment re-circulate sub-mode state machine NUM_OF_TREATMENT_RECIRC_STATES ///< Number of treatment re-circulate sub-mode states }; @@ -615,6 +643,7 @@ DIALYZER_TYPE_BBRAUN_PRO_19H, ///< BBraun Diacap Pro 19H DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE, ///< Fresenius Optiflux F160NRe DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE, ///< Fresenius Optiflux F180NRe + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F200NRE, ///< Fresenius Optiflux F200NRe NUM_OF_DIALYZER_TYPES ///< Number of dialyzer types }; typedef enum Dialyzer_Types DIALYZER_TYPE_T; ///< Type for dialyzer types enumeration @@ -647,7 +676,7 @@ HD_PUMP_DIALYSATE_OUTLET_PUMP, ///< HD Dialysate outlet pump HD_PUMP_SYRINGE, ///< HD Syringe pump NUM_OF_HD_PUMPS ///< Number of HD pumps -}; +}; typedef enum HD_Pumps HD_PUMP_T; ///< Type for HD pump enumeration /** @@ -662,20 +691,31 @@ DIALYSATE_FLOW_RATE_CHANGE_EVENT, ///< Dialysate flow rate change event TREATMENT_DURATION_CHANGE_EVENT, ///< Treatment duration change event UF_VOLUME_CHANGE_EVENT, ///< Ultrafiltration volume change event - UF_PAUSE_RESUME_EVENT, ///< Ultrafiltration pause/resume event + UF_RATE_CHANGE_EVENT, ///< Ultrafiltration rate change event + UF_START_RESUME_EVENT, ///< Ultrafiltration start or resume event + UF_PAUSE_EVENT, ///< Ultrafiltration pause event ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, ///< Arterial pressure lower limit change event ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, ///< Arterial pressure upper limit change event VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT, ///< Venous pressure lower limit change event VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT, ///< Venous pressure upper limit change event - HEPARIN_PAUSE_RESUME_EVENT, ///< Heparin pause/resume event + HEPARIN_BOLUS_START_EVENT, ///< Heparin bolus start event + 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 MID_TREATMENT_RINSE_BACK_EVENT, ///< Mid treatment rinse-back event + ALARM_AUDIO_VOLUME_CHANGED_EVENT, ///< Alarm audio volume changed event + FRONT_DOOR_SWITCH_CHANGED_EVENT, ///< Front door switch changed event + PUMP_TRACK_SWITCH_CHANGED_EVENT, ///< Pump track switch changed event + SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, ///< Syringe detection switch changed event + OFF_BUTTON_PRESSED_EVENT, ///< Off button pressed event + STOP_BUTTON_PRESSED_EVENT, ///< Stop button pressed 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 /**@}*/ - + /** * @addtogroup CommonHeader * @{ @@ -693,4 +733,4 @@ /**@}*/ -#endif +#endif