Index: HDDefs.h =================================================================== diff -u -r15af8a83e455043f39016c98d9171abde395764b -reaba3140f44ef84cd5c1ea1367d6b20cfb48d64a --- HDDefs.h (.../HDDefs.h) (revision 15af8a83e455043f39016c98d9171abde395764b) +++ HDDefs.h (.../HDDefs.h) (revision eaba3140f44ef84cd5c1ea1367d6b20cfb48d64a) @@ -401,9 +401,6 @@ 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 -#ifdef DIALYZER_REPRIME_ENABLED - DIALYSIS_DIALYZER_REPRIME_STATE, ///< Dialyzer reprime state of the dialysis sub-mode state machine -#endif NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states }; typedef enum Dialysis_States DIALYSIS_STATE_T; ///< Type for dialysis states enumeration @@ -437,20 +434,6 @@ }; typedef enum Saline_Commands SALINE_CMD_T; ///< Type for saline command enum. -#ifdef DIALYZER_REPRIME_ENABLED -/// Enumeration of dialyzer reprime states. -enum Dialyzer_Reprime_States -{ - DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF = 0, ///< Turn off dialysate pumps and wait for them to stop - DIALYZER_REPRIME_STATE_PURGE_PRIOR_1, ///< Purge air from an interrupted reprime - DIALYZER_REPRIME_STATE_PURGE_PRIOR_2, ///< Purge air from an interrupted reprime - DIALYZER_REPRIME_STATE_REPRIME, ///< Remove air from dialyzer - DIALYZER_REPRIME_STATE_PURGE_LINES, ///< Purge air from lines after repriming dialyzer - NUM_OF_DIALYZER_REPRIME_STATES ///< Number of dialyzer reprime states -}; -typedef enum Dialyzer_Reprime_States DIALYZER_REPRIME_STATE_T; ///< Type for dialyzer reprime state enumeration -#endif - /// Enumeration of ultrafiltration command IDs. enum UF_Commands { @@ -513,6 +496,7 @@ 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 }; /// Type for treatment stop states enumeration. @@ -829,6 +813,4 @@ NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status } CONFIRMATION_REQUEST_STATUS_T; -/**@}*/ - #endif