Index: DDDefs.h =================================================================== diff -u -r78128d9126978673733e2e1b24e88ac72f6a3571 -rcccd9c9d23a6be09d331ab3aae8b7415757b682d --- DDDefs.h (.../DDDefs.h) (revision 78128d9126978673733e2e1b24e88ac72f6a3571) +++ DDDefs.h (.../DDDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) @@ -490,14 +490,14 @@ /// 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 + 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 @@ -511,52 +511,56 @@ /// Enumeration of DryBicart fill exec states. enum Dry_Bicart_Fill_Exec_States { - DRY_BICART_START_STATE = 0, ///< Initial state of dry bicart fill - DRY_BICART_FILL_WATER_START_STATE, ///< Dry bicart fill start state - DRY_BICART_FILL_WATER_END_STATE, ///< Dry bicart fill end state - DRY_BICART_DEGAS_START_STATE, ///< Dry bicart vent start state - DRY_BICART_DEGAS_END_STATE, ///< Dry bicart vent end state - DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state - DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state - NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states + DRY_BICART_FILL_IDLE_STATE = 0, ///< Initial state of dry bicart fill + DRY_BICART_FILL_WATER_STATE, ///< Dry bicart fill water start state + DRY_BICART_VENT_STATE, ///< Dry bicart vent end state + DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state + DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state + NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states }; typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration /// Enumeration of Bicarb chamber fill exec states. enum Bicarb_Chamber_F_Fill_Exec_States { - BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill - BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber fill start state - BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state - BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery - BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery - BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state - BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state - NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state + BICARB_CHAMBER_SUPPLY_IDLE_STATE = 0, ///< Initial state of Chamber F supply + BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber supply complete state + BICARB_CARTRIDGE_FILL_WATER_STATE, ///< Dry bicart fill water end state while dialysate delivery + BICARB_SUPPLY_VENT_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state }; typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration /// Enumeration of DryBicart drain exec states enum Dry_Bicart_Drain_Exec_States { - DRY_BICART_DRAIN_START_STATE = 0, ///< Initial state of dry bicart drain - DRY_BICART_FLUID_DRAIN_STATE, ///< Dry bicart fluid drain state - DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart drain duration check state - DRY_BICART_FLUID_DRAIN_END_STATE, ///< Dry bicart drain end state - NUM_OF_DRY_BICART_DRAIN_EXEC_STATES + BICART_DRAIN_IDLE_STATE = 0, ///< Initial state of dry bicart drain + BICART_DRAIN_STATE, ///< Dry bicart bicarb drain state + BICART_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart bicarb drain duration check state + NUM_OF_DRY_BICART_DRAIN_EXEC_STATES ///< Number of dry bicart drain states }; typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration /// Enumeration of drybicart depressurize exec states enum Dry_Bicart_Depressurize_Exec_States { - DRY_BICART_DEPRESSURIZE_START_STATE = 0, ///< Initial state of dry bicart depressurise - DRY_BICART_DEPRESSURIZE_VENT_START_STATE, ///< Dry bicart depressurize vent start state - DRY_BICART_DEPRESSURIZE_VENT_END_STATE, ///< Dry bicart depressurize vent end state - NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES + DRY_BICART_DEPRESSURIZE_IDLE_STATE = 0, ///< Initial state of dry bicart depressurise + DRY_BICART_DEPRESSURIZE_STATE, ///< Dry bicart depressurize vent start state + NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES ///< Number of dry bicart depressurize states }; typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize exec state enumeration +/// Enumeration of transient sequence step states +enum SequenceStep_States +{ + SEQUENCE_STEP0_STATE = 0, ///< Initial state of transient sequence step state + SEQUENCE_STEP1_STATE, ///< Transient sequence step2 state + SEQUENCE_STEP2_STATE, ///< Transient sequence step3 state + NUM_OF_SEQUENCE_STEP_STATES ///< Number of Sequence step states +}; +typedef enum SequenceStep_States SEQUENCE_STEP_STATE_T; ///< Type for Sequence step state enumeration + + /// Enumeration of conductivity sensors. enum Conductivity_Sensors {