Index: DDDefs.h =================================================================== diff -u -r08258a6f408a008ff43100cd960a4527b8a19011 -rbfdf1fb5beb20010983457ab4588684c25f50c13 --- DDDefs.h (.../DDDefs.h) (revision 08258a6f408a008ff43100cd960a4527b8a19011) +++ DDDefs.h (.../DDDefs.h) (revision bfdf1fb5beb20010983457ab4588684c25f50c13) @@ -32,7 +32,9 @@ DD_MODE_SERV, ///< Service mode DD_MODE_INIT, ///< Initialization & POST mode DD_MODE_STAN, ///< Standby mode + DD_MODE_PREG, ///< Dialysate Pre-Generation mode DD_MODE_GEND, ///< Generate Dialysate mode + DD_MODE_POSG, ///< Post Dialysate Generation mode DD_MODE_HEAT, ///< Heat Disinfect mode DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode @@ -80,12 +82,22 @@ enum DD_Fault_States { DD_FAULT_STATE_START = 0, ///< DD fault start state - DD_FAULT_STATE_RUN_NV_POSTS, ///< DD fault run RTC and NV data management posts - DD_FAULT_STATE_COMPLETE, ///< DD fault complete + DD_FAULT_DEENERGIZED_STATE, ///< DD fault deenergized state + DD_FAULT_ENERGIZED_STATE, ///< DD fault energized state NUM_OF_DD_FAULT_STATES ///< Number of fault mode states }; typedef enum DD_Fault_States DD_FAULT_STATE_T; ///< Type for DD fault states enumeration +/// Enumeration of fault NV data management states. +enum DD_Fault_NVDataMgmt_States +{ + DD_FAULT_NVDATA_STATE_START = 0, ///< DD fault NVData management start state + DD_FAULT_NVDATA_STATE_RUN_NV_POSTS, ///< DD fault run RTC and NV data management posts + DD_FAULT_NVDATA_STATE_COMPLETE, ///< DD fault NVData management complete + NUM_OF_DD_FAULT_NVDATA_STATES ///< Number of fault NVdata management states +}; +typedef enum DD_Fault_NVDataMgmt_States DD_FAULT_NVDATA_STATE_T; ///< Type for DD fault NVdata Management states enumeration + /**@}*/ /** @@ -116,6 +128,41 @@ /**@}*/ /** + * @addtogroup DDPreGenDialysateMode + * @{ + */ + +/// Enumeration of Pre-Gen Dialysate mode states. +enum DD_Pre_Gen_Dialysate_States +{ + DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0, ///< DD Pre-Gen Dialysate hyrochamber fill check + DD_PRE_GEN_WET_SELF_TEST, ///< DD Pre-Gen WetSelf Test + DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND, ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition + NUM_OF_DD_PRE_GEN_DIALYSATE_STATES ///< Number of Pre-Gen Dialysate mode states +}; +typedef enum DD_Pre_Gen_Dialysate_States DD_PRE_GEN_DIALYSATE_STATE_T; ///< Type for DD Pre-Gen Dialysate states enumeration + +/// Enumeration of Pre-Gen Wet self test states. +enum DD_Pre_Gen_Wet_Self_Test_States +{ + DD_WET_SELF_TEST_START = 0, ///< DD Wet Slef test Start + DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK, ///< DD Wet Self Test Negative Deaeration Pressure check + DD_WET_SELF_TEST_POSITIVE_DEAERATION_PRES_CHECK, ///< DD Wet Self Test Postive Deaeration Pressure check + DD_WET_SELF_TEST_SPENT_DIAL_PRES_CHECK, ///< DD Wet Self Test Spent Dialysate Pressure check + DD_WET_SELF_TEST_BAL_CHAMBER_VALV_LEAK_CHECK, ///< DD Wet Self Test Balancing Chamber Valve Leak check + DD_WET_SELF_TEST_DIAL_FLOW_PATH_LEAK_CHECK, ///< DD Wet Self Test Dialysate flow path leak check + DD_WET_SELF_TEST_UF_PRES_DROP_CHECK, ///< DD Wet Self Test Ultrafilter pressure drop check + DD_WET_SELF_TEST_BLOOD_LEAK_CHECK, ///< DD Wet Self Test Ultrafilter pressure drop check + DD_WET_SELF_TEST_BAL_CHAMBER_MEMBRANE_INTEGRITY_CHECK, ///< DD Wet Self Test Balancing Chamber Membrane Integrity check + DD_WET_SELF_TEST_LEVEL_SENSOR_CHECK, ///< DD Wet Self Test Level Sensor check + DD_WET_SELF_TEST_PAUSE, ///< DD Wet Self Test Pause state + NUM_OF_DD_PRE_GEN_WET_SELF_TEST_STATES ///< Number of Wet Self Test states +}; +typedef enum DD_Pre_Gen_Wet_Self_Test_States DD_WET_SELF_TEST_STATE_T; ///< Type for DD Pre-Gen Wet Self Test states enumeration + +/**@}*/ + +/** * @addtogroup DDGenDialysateMode * @{ */ @@ -124,36 +171,53 @@ 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_BYPASS_STATE, ///< Gen dialysate - Bypass dialysate state DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - deliver dialysate state + DD_GEND_ISOLATED_UF_STATE, ///< Gen dialysate - Isolated ultrafiltration state + DD_GEND_SPENT_CHAMBER_FILL_STATE, ///< Gen dialysate - spent chamber fill state + DD_GEND_BICARB_CHAMBER_FILL_STATE, ///< Gen dialysate - bicarb chamber fill 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 +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; +}; +typedef enum dd_acid_types DD_ACID_TYPES_T; /// DD bicarb types -typedef enum dd_bicarb_types +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; +}; +typedef enum dd_bicarb_types DD_BICARB_TYPES_T; /**@}*/ /** + * @addtogroup DDPostGenDialysateMode + * @{ + */ + +/// Enumeration of Post Gen Dialysate mode states. +enum DD_Post_Gen_Dialysate_States +{ + DD_POST_GEN_DIALYSATE_STATE_START = 0, ///< DD Post-Gen Dialysate state start + DD_POST_GEN_DIALYSATE_STATE_COMPLETE, ///< DD Post-Gen Dialysate complete state + NUM_OF_DD_POST_GEN_DIALYSATE_STATES ///< Number of Post-Gen Dialysate mode states +}; +typedef enum DD_Post_Gen_Dialysate_States DD_POST_GEN_DAILYSATE_STATE_T; ///< Type for DD Post-Gen Dialysate states enumeration + +/**@}*/ + +/** * @addtogroup DDHeatDisinfectMode * @{ */ @@ -189,15 +253,16 @@ #endif /// Cancellation paths -typedef enum Cancellation_modes +enum Cancellation_modes { CANCELLATION_MODE_NONE = 0, ///< Cancellation mode none. CANCELLATION_MODE_BASIC, ///< Cancellation mode basic. CANCELLATION_MODE_HOT, ///< Cancellation mode hot. CANCELLATION_MODE_COLD, ///< Cancellation mode cold. CANCELLATION_MODE_WATER, ///< Cancellation mode water. NUM_OF_CANCELLATION_MODES ///< Number of cancellation modes. -} CANCELLATION_MODE_T; +}; +typedef enum Cancellation_modes CANCELLATION_MODE_T; /**@}*/ @@ -229,7 +294,7 @@ }; typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration -/// Enumeration of sample water command parameters. +/// Enumeration of general commands to DD sub-system. enum DD_General_Commands { DD_CMD_STOP = 0, ///< DD general stop command @@ -256,6 +321,7 @@ DD_EVENT_D63_LEVL_CHANGE, ///< DD bicarb level change event DD_EVENT_D46_LEVL_CHANGE, ///< DD spent dialysate air seperation level change event DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss + DD_EVENT_TEMPERATURE_DRIFT, ///< DD dialysate temperature drift 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 @@ -268,18 +334,69 @@ */ /// Heaters exec states -typedef enum Heaters_Exec_States +enum Heaters_Exec_States { HEATER_EXEC_STATE_OFF = 0, ///< Heater exec state off. HEATER_EXEC_STATE_RAMP_TO_TARGET, ///< Heater exec state ramp to target. HEATER_EXEC_STATE_CONTROL_TO_TARGET, ///< Heater exec state control to target. HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET, ///< Heater exec state control to disinfect (heat) target. NUM_OF_HEATERS_STATE, ///< Number of heaters state. -} HEATERS_STATE_T; +}; +typedef enum Heaters_Exec_States HEATERS_STATE_T; + /**@}*/ /** + * @addtogroup Valves + * @{ + */ + +/// Enumeration of valves. +enum DD_Valves +{ + FIRST_HYD_VALVE = 0, ///< Start of Hydraulics valve group + D14_VALV = FIRST_HYD_VALVE, ///< Valve Hydraulics Outlet (D14) + D52_VALV, ///< Valve Thermal Disinfect (D52) + D8_VALV, ///< Valve Hydraulics Bypass (D8) + D54_VALV, ///< Valve Rinse Port (D54) + D53_VALV, ///< Valve Drain (D53) + D34_VALV, ///< Valve Dialyzer Bypass (D34) + D64_VALV, ///< Valve Purge 1 (D64) + D31_VALV, ///< Valve Pressure Test (D31) + D65_VALV, ///< Valve DryBcarb Inlet (D65) + D35_VALV, ///< Valve Dialyzer Inlet (D35) + D40_VALV, ///< Valve Dialyzer Outlet (D40) + D47_VALV, ///< Valve Dialysate Out Purge 2 (D47) + D3_VALV, ///< Valve Hydraulics Inlet (D3) + // For standalone DD system, may need to control IO valve. + DD_M4_VALV, ///< Valve Water Inlet (M4) + LAST_HYD_VALVE = DD_M4_VALV, ///< End of Hydraulics valve of group + RSRVD_SPACE1, ///< This space has been reserved + RSRVD_SPACE2, ///< This space has been reserved + FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group + D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) + D19_VALV, ///< Balancing chamber Valve 2 (D19) + D25_VALV, ///< Balancing chamber Valve 3 (D25) + D26_VALV, ///< Balancing chamber Valve 7 (D26) + D24_VALV, ///< Balancing chamber Valve 5 (D24) + D20_VALV, ///< Balancing chamber Valve 6 (D20) + D21_VALV, ///< Balancing chamber Valve 4 (D21) + D22_VALV, ///< Balancing chamber Valve 8 (D22) + LAST_BC_VALVE = D22_VALV, ///< End of Balancing Chamber valve group + FIRST_UF_VALVE, ///< Start of Ultrafiltration valve group + D69_VALV = FIRST_UF_VALVE, ///< Ultrafiltration Valve 1 Inlet (D69) + D71_VALV, ///< Ultrafiltration Valve 2 Inlet (D71) + D70_VALV, ///< Ultrafiltration Valve 1 Outlet (D70) + D72_VALV, ///< Ultrafiltration Valve 2 Outlet (D72) + LAST_UF_VALVE = D72_VALV, ///< End of Ultrafiltration valve group + DD_NUM_OF_VALVES ///< Number of valves +}; +typedef enum DD_Valves DD_VALVES_T; + +/**@}*/ + +/** * @addtogroup BalancingChamber * @{ */ @@ -290,9 +407,11 @@ 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_VALVES_CLOSE, ///< Balancing Chamber state 1 valves close 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_VALVES_CLOSE, ///< Balancing Chamber state 2 valves close state BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states }; @@ -309,4 +428,41 @@ /**@}*/ +/** + * @addtogroup Ultrafiltraion + * @{ + */ + +/// Enumeration of ultra filtration exec states. +enum Ultra_filtration_Exec_States +{ + DD_UF_PAUSED = 0, ///< Ultrafiltration pasued state + DD_UF_RUNNING, ///< Ultrafiltration running state + NUM_OF_UF_EXEC_STATES ///< Number of ultrafiltration exec states +}; +typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T; ///< Type for ultrafiltration exec state enumeration + +/**@}*/ + +/** + * @addtogroup SpentChamberFill + * @{ + */ + +/// Enumeration of Spent chamber fill exec states. +enum Spent_Chamber_Fill_Exec_States +{ + SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_STATE1_FILL_START, ///< Spent chamber fill state 1 fill start state + SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL, ///< Spent chamber fill state 1 dosing control + SPENT_CHAMBER_FILL_STATE1_FILL_END, ///< Spent chamber fill state 1 fill end state + SPENT_CHAMBER_FILL_STATE2_FILL_START, ///< Spent chamber fill state 2 fill start state + SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL, ///< Spent chamber fill state 2 dosing control + SPENT_CHAMBER_FILL_STATE2_FILL_END, ///< Spent chamber fill state 2 fill end state + NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES ///< Number of spent chamber fill states +}; +typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration + +/**@}*/ + #endif