Index: HDDefs.h =================================================================== diff -u -r7b502f7e532b1b8c69b28f3dab7002cda4921990 -re4dee34da24914019a3cf84bebf762d8c4ebdc50 --- HDDefs.h (.../HDDefs.h) (revision 7b502f7e532b1b8c69b28f3dab7002cda4921990) +++ HDDefs.h (.../HDDefs.h) (revision e4dee34da24914019a3cf84bebf762d8c4ebdc50) @@ -36,7 +36,7 @@ MODE_PRET, ///< Pre-Treatment mode MODE_TREA, ///< Treatment mode MODE_POST, ///< Post-Treatment mode - MODE_NLEG, ///< Not legal - an illegale mode transition occurred + 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 @@ -149,8 +149,9 @@ /// Enumeration of sample water sub-mode states. enum HD_Pre_Treatment_Sample_Water_States { - SAMPLE_WATER_SETUP_STATE = 0, ///< Sample water setup state of the sample water sub-mode state machine - SAMPLE_WATER_STATE, ///< Sample water state of the sample water sub-mode state machine + SAMPLE_WATER_SETUP_STATE = 0, ///< Sample water setup (flush filter) state + SAMPLE_WATER_STATE, ///< Sample water state, receiving sample water commands from the user + SAMPLE_WATER_COMPLETE_STATE, ///< Sample water complete state NUM_OF_SAMPLE_WATER_STATES ///< Number of sample water sub-mode states }; /// Type for sample water states enumeration. @@ -202,12 +203,12 @@ 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_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state - NO_CART_SELF_TESTS_DOOR_SWITCH_STATE, ///< No cartridge door switch self-test state + NO_CART_SELF_TESTS_START_HOMING_STATE, ///< No cartridge start home valves and pumps state NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE, ///< No cartridge home valves and pumps self-test state NO_CART_SELF_TESTS_HOME_IDLE_STATE, ///< Wait for valves and pumps finish homing state + NO_CART_SELF_TESTS_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state NO_CART_SELF_TESTS_STOPPED_STATE, ///< No cart self-test stopped state NO_CART_SELF_TESTS_COMPLETE_STATE, ///< No cartridge self-test complete state NUM_OF_NO_CART_SELF_TESTS_STATES ///< Number of no cartridge self-tests states @@ -220,12 +221,12 @@ { 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_BUBBLE_DETECTOR_STATE, ///< Bubble detectors dry self-test state - DRY_SELF_TESTS_AIR_TRAP_STATE, ///< Air trap fill level ultrasonic sensor dry self-test state + DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check dry self-test state DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< Occlusion sensors dry self-test state DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE, ///< Pressure sensors dry self-test setup valves and pump state DRY_SELF_TESTS_PRESSURE_SENSORS_STATE, ///< Pressure sensors verify pressure readings state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Preassure sensors verify normal pressure readings 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_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 @@ -306,8 +307,10 @@ /// Enumeration of post-treatment mode states. enum HD_Post_Treatment_Mode_States -{ - HD_POST_TREATMENT_STATE_START = 0, ///< Start post-treatment mode state +{ + HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0, ///< Patient disconnection state + HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE, ///< Drain reservoirs 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 @@ -350,8 +353,6 @@ 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 - UF_OFF_STATE, ///< Completed/off state of the ultrafiltration state machine - UF_COMPLETED_STATE, ///< Completed state of ultrafiltration state machine NUM_OF_UF_STATES ///< Number of ultrafiltration states }; typedef enum UF_States UF_STATE_T; ///< Type for ultrafiltration states enumeration @@ -370,8 +371,8 @@ /// Enumeration of saline bolus command parameters. enum Saline_Commands { - SALINE_CMD_STOP = 0, ///< Start saline bolus command - SALINE_CMD_START, ///< Stop saline bolus command + 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 }; typedef enum Saline_Commands SALINE_CMD_T; ///< Type for saline command enum. @@ -397,14 +398,15 @@ /**@}*/ /** - * @addtogroup Heparin + * @addtogroup SyringePump * @{ */ /// Enumeration of heparin states. enum Heparin_States { HEPARIN_STATE_OFF = 0, ///< No heparin delivery is in progress + HEPARIN_STATE_STOPPED, ///< Heparin delivery stopped by alarm or not yet started HEPARIN_STATE_PAUSED, ///< Heparin delivery paused HEPARIN_STATE_INITIAL_BOLUS, ///< Initial heparin bolus delivery in progress HEPARIN_STATE_DISPENSING, ///< Gradual heparin dispensing in progress