Index: DDDefs.h =================================================================== diff -u -r83743c433516c53e32ee0807b25401965848f6a3 -r581c7ef4bb3af907e49b9a5619d7addd47057075 --- DDDefs.h (.../DDDefs.h) (revision 83743c433516c53e32ee0807b25401965848f6a3) +++ DDDefs.h (.../DDDefs.h) (revision 581c7ef4bb3af907e49b9a5619d7addd47057075) @@ -61,7 +61,6 @@ DD_POST_STATE_DIALYSATE_PUMPS, ///< Dialysate pumps POST state DD_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state DD_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state - DD_POST_STATE_THERMISTORS, ///< Thermistors POST state DD_POST_STATE_WATCHDOG, ///< Watchdog POST test state DD_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state DD_POST_STATE_COMPLETED, ///< POST completed successfully state @@ -98,9 +97,6 @@ enum DD_Standby_Mode_States { DD_STANDBY_MODE_STATE_IDLE = 0, ///< Idle standby mode state - DD_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state - DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state - DD_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state DD_STANDBY_MODE_STATE_PAUSE, ///< Pause state NUM_OF_DD_STANDBY_MODE_STATES ///< Number of standby mode states }; @@ -120,6 +116,44 @@ /**@}*/ /** + * @addtogroup DDGenDialysateMode + * @{ + */ + +/// Enumeration of GenDialysate mode states. +enum DD_GenD_Mode_States +{ + DD_GEND_STATE_START = 0, ///< Gen dialysate start state + DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE, ///< Gen dialysate Hydraulic chamber water inlet check state + DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE, ///< Gen dialysate Hydraulic chamber pressure check state + DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate fresh dialysate pressure check state + DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate spent dialysate pressure check state + DD_GEND_PRODUCE_DIALYSATE_STATE, ///< Gen dialysate - produce dialysate state + DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - deliver dialysate state + DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states +}; +typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration + +/// DD acid types +typedef enum dd_acid_types +{ + ACID_08_1251_1 = 0, ///< Acid type 08-1251-1. + ACID_08_2251_0, ///< Acid type 08-2251-0. + ACID_08_3251_9, ///< ACid type 08-3251-9. + NUM_OF_ACID_TYPE ///< Number of acid types. +} DD_ACID_TYPES_T; + +/// DD bicarb types +typedef enum dd_bicarb_types +{ + BICARB_08_677753_0 = 0, ///< Bicarb type 08-677753-0 + NUM_OF_BICARB_TYPE ///< Number of bicarb types. +} DD_BICARB_TYPES_T; + +/**@}*/ + +/** * @addtogroup DDHeatDisinfectMode * @{ */ @@ -222,6 +256,7 @@ DD_EVENT_FLOATER_2_LEVEL_CHANGE, ///< DD floater 2 level change event DD_EVENT_BICARB_LEVEL_CHANGE, ///< DD bicarb level change event DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, ///< DD spent dialysate air seperation level change event + DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration @@ -245,4 +280,34 @@ /**@}*/ +/** + * @addtogroup BalancingChamber + * @{ + */ + +/// Enumeration of balancing chamber exec states. +enum Balancing_Chamber_Exec_States +{ + BAL_CHAMBER_STATE_START = 0, ///< Initial state of balancing chamber + BAL_CHAMBER_STATE1_FILL_START, ///< Balancing chamber state 1 fill start state + BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 1 Bicarb and acid dosing control state + BAL_CHAMBER_STATE1_FILL_END, ///< Balancing Chamber state 1 fill end state + BAL_CHAMBER_STATE2_FILL_START, ///< Balancing chamber state 2 fill start state + BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 2 Bicarb and acid dosing control state + BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state + NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Exec_States BAL_CHAMBER_EXEC_STATE_T; ///< Type for balancing chamber exec state enumeration + +/// Enumeration of balancing chamber states. +enum Balancing_Chamber_Switching_States +{ + BAL_CHAMBER_SW_STATE1 = 0, ///< Balancing chamber switching state 1 (V2,V5 and V3, V8 open, rest closed) + BAL_CHAMBER_SW_STATE2, ///< Balancing chamber switching state 2 ( V1,V6 and V4, V7 open, rest closed) + NUM_OF_BAL_CHAMBER_SW ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Switching_States BAL_CHAMBER_SW_STATE_T; ///< Type for balancing chamber Switching state enumeration + +/**@}*/ + #endif