Index: AlarmDefs.h =================================================================== diff -u -rae2a434072551837645764125d1d7cfa994e0786 -r22c198bec7c2e7bb993e68d930a567bd8f26c36f --- AlarmDefs.h (.../AlarmDefs.h) (revision ae2a434072551837645764125d1d7cfa994e0786) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) @@ -8,7 +8,7 @@ * @file AlarmDefs.h * * @author (last) Sean -* @date (last) 30-Jul-2024 +* @date (last) 01-Aug-2024 * * @author (original) Sean * @date (original) 30-Jul-2024 Index: DDDefs.h =================================================================== diff -u -rae2a434072551837645764125d1d7cfa994e0786 -r22c198bec7c2e7bb993e68d930a567bd8f26c36f --- DDDefs.h (.../DDDefs.h) (revision ae2a434072551837645764125d1d7cfa994e0786) +++ DDDefs.h (.../DDDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) @@ -80,7 +80,7 @@ /**@}*/ /** - * @addtogroup DGFaultMode + * @addtogroup DDFaultMode * @{ */ @@ -97,23 +97,23 @@ /**@}*/ /** - * @addtogroup DGSoloStandbyMode + * @addtogroup DDSoloStandbyMode * @{ */ /// Enumeration of solo standby mode states. -enum DG_Solo_States +enum DD_Solo_States { - DG_SOLO_STANDBY_STATE_START = 0, ///< Start solo standby mode state - DG_SOLO_IDLE_STATE, ///< Idle solo standby mode state - NUM_OF_DG_SOLO_STANDBY_STATES ///< Number of solo standby mode states + DD_SOLO_STANDBY_STATE_START = 0, ///< Start solo standby mode state + DD_SOLO_IDLE_STATE, ///< Idle solo standby mode state + NUM_OF_DD_SOLO_STANDBY_STATES ///< Number of solo standby mode states }; -typedef enum DG_Solo_States DG_SOLO_STANDBY_STATE_T; ///< Type for DG solo mode states enumeration +typedef enum DD_Solo_States DD_SOLO_STANDBY_STATE_T; ///< Type for DD solo mode states enumeration /**@}*/ /** - * @addtogroup DGStandbyMode + * @addtogroup DDStandbyMode * @{ */ @@ -132,71 +132,71 @@ /**@}*/ /** - * @addtogroup DGRecirculateMode + * @addtogroup DDRecirculateMode * @{ */ /// Enumeration of generation idle mode states. -enum DG_Generation_Idle_Mode_States +enum DD_Generation_Idle_Mode_States { - DG_GEN_IDLE_MODE_STATE_START = 0, ///< Start generation idle mode state - DG_GEN_IDLE_MODE_STATE_FLUSH_WATER, /// Handle normal fill state (idle 0.0) - DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL, ///< Handle bad fill state (idle 1.0) - NUM_OF_DG_GEN_IDLE_MODE_STATES ///< Number of idle mode states + DD_GEN_IDLE_MODE_STATE_START = 0, ///< Start generation idle mode state + DD_GEN_IDLE_MODE_STATE_FLUSH_WATER, /// Handle normal fill state (idle 0.0) + DD_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL, ///< Handle bad fill state (idle 1.0) + NUM_OF_DD_GEN_IDLE_MODE_STATES ///< Number of idle mode states }; -typedef enum DG_Generation_Idle_Mode_States DG_GEN_IDLE_MODE_STATE_T; ///< Type for DG generation idle mode states enumeration +typedef enum DD_Generation_Idle_Mode_States DD_GEN_IDLE_MODE_STATE_T; ///< Type for DD generation idle mode states enumeration /// Enumeration of generation idle mode states. -enum DG_Generation_Idle_Mode_Bad_Fill_Substates +enum DD_Generation_Idle_Mode_Bad_Fill_Substates { - DG_HANDLE_BAD_FILL_STATE_START = 0, ///< Bad fill start state - DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN, ///< First drain the dialysate - DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL, ///< Flush then fill the dialysate - DG_HANDLE_BAD_FILL_STATE_SECOND_DRAIN, ///< Second drain the dialysate - DG_HANDLE_BAD_FILL_STATE_REFILL, ///< Refill the dialysate - NUM_OF_DG_HANDLE_BAD_FILL_STATES ///< Number of bad fill states + DD_HANDLE_BAD_FILL_STATE_START = 0, ///< Bad fill start state + DD_HANDLE_BAD_FILL_STATE_FIRST_DRAIN, ///< First drain the dialysate + DD_HANDLE_BAD_FILL_STATE_FLUSH_FILL, ///< Flush then fill the dialysate + DD_HANDLE_BAD_FILL_STATE_SECOND_DRAIN, ///< Second drain the dialysate + DD_HANDLE_BAD_FILL_STATE_REFILL, ///< Refill the dialysate + NUM_OF_DD_HANDLE_BAD_FILL_STATES ///< Number of bad fill states }; -typedef enum DG_Generation_Idle_Mode_Bad_Fill_Substates DG_GEN_IDLE_MODE_BAD_FILL_STATE_T; ///< Type for DG generation idle mode bad fill sub-states enumeration +typedef enum DD_Generation_Idle_Mode_Bad_Fill_Substates DD_GEN_IDLE_MODE_BAD_FILL_STATE_T; ///< Type for DD generation idle mode bad fill sub-states enumeration /**@}*/ /** - * @addtogroup DGFillMode + * @addtogroup DDFillMode * @{ */ /// Enumeration of fill mode states. -enum DG_Fill_Mode_States +enum DD_Fill_Mode_States { - DG_FILL_MODE_STATE_TEST_INLET_WATER = 0, ///< Test inlet water quality state - DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES, ///< Prime the acid and bicarb concentrate lines - DG_FILL_MODE_STATE_FLUSH_BUBBLES, ///< Flush the bubbles in the lines state - DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY, ///< Test the conductivity range of the bicarb concentrate state - DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY, ///< Test the conductivity range of the acid concentrate state - DG_FILL_MODE_STATE_PRODUCE_DIALYSATE, ///< Dialysate production state - DG_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Dialysate deliver state - DG_FILL_MODE_STATE_PAUSED, ///< Dialysate generation pause state - NUM_OF_DG_FILL_MODE_STATES ///< Number of fill mode states + DD_FILL_MODE_STATE_TEST_INLET_WATER = 0, ///< Test inlet water quality state + DD_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES, ///< Prime the acid and bicarb concentrate lines + DD_FILL_MODE_STATE_FLUSH_BUBBLES, ///< Flush the bubbles in the lines state + DD_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY, ///< Test the conductivity range of the bicarb concentrate state + DD_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY, ///< Test the conductivity range of the acid concentrate state + DD_FILL_MODE_STATE_PRODUCE_DIALYSATE, ///< Dialysate production state + DD_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Dialysate deliver state + DD_FILL_MODE_STATE_PAUSED, ///< Dialysate generation pause state + NUM_OF_DD_FILL_MODE_STATES ///< Number of fill mode states }; -typedef enum DG_Fill_Mode_States DG_FILL_MODE_STATE_T; ///< Type for DG fill mode states enumeration +typedef enum DD_Fill_Mode_States DD_FILL_MODE_STATE_T; ///< Type for DD fill mode states enumeration /**@}*/ /** - * @addtogroup DGDrainMode + * @addtogroup DDDrainMode * @{ */ /// Enumeration of drain mode states. -enum DG_Drain_States +enum DD_Drain_States { - DG_DRAIN_STATE_START = 0, ///< Start drain mode state - DG_DRAIN_STATE_DRAIN, ///< Drain drain mode state - DG_DRAIN_STATE_TARE, ///< Tare drain mode state - DG_DRAIN_STATE_RINSE, ///< Rinse concentrate lines drain mode state - NUM_OF_DG_DRAIN_STATES ///< Number of drain mode states + DD_DRAIN_STATE_START = 0, ///< Start drain mode state + DD_DRAIN_STATE_DRAIN, ///< Drain drain mode state + DD_DRAIN_STATE_TARE, ///< Tare drain mode state + DD_DRAIN_STATE_RINSE, ///< Rinse concentrate lines drain mode state + NUM_OF_DD_DRAIN_STATES ///< Number of drain mode states }; -typedef enum DG_Drain_States DG_DRAIN_STATE_T; ///< Type for DG drain mode states enumeration +typedef enum DD_Drain_States DD_DRAIN_STATE_T; ///< Type for DD drain mode states enumeration /**@}*/ @@ -206,48 +206,48 @@ */ /// Sub-mode states while in standby mode disinfect -enum DG_Disinfect_States +enum DD_Disinfect_States { - DG_DISINFECT_FLUSH_STATE = 0, ///< DG disinfect flush - DG_DISINFECT_HEAT_STATE, ///< DG disinfect heat - DG_DISINFECT_CHEM_STATE, ///< DG disinfect chemical - DG_DISINFECT_CHEM_FLUSH_STATE, ///< DG disinfect chemical flush - DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE, ///< DG disinfect RO permeate sample - DG_DISINFECT_NOT_RUNNING_STATE, ///< DG disinfect not running - NUM_OF_DG_DISINFECT_STATES ///< Number of DG disinfect states + DD_DISINFECT_FLUSH_STATE = 0, ///< DD disinfect flush + DD_DISINFECT_HEAT_STATE, ///< DD disinfect heat + DD_DISINFECT_CHEM_STATE, ///< DD disinfect chemical + DD_DISINFECT_CHEM_FLUSH_STATE, ///< DD disinfect chemical flush + DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE, ///< DD disinfect RO permeate sample + DD_DISINFECT_NOT_RUNNING_STATE, ///< DD disinfect not running + NUM_OF_DD_DISINFECT_STATES ///< Number of DD disinfect states }; -typedef enum DG_Disinfect_States DG_DISINFECT_STATE_T; ///< Type for DG disinfect states that are broadcast to UI +typedef enum DD_Disinfect_States DD_DISINFECT_STATE_T; ///< Type for DD disinfect states that are broadcast to UI /**@}*/ /** - * @addtogroup DGFlushMode + * @addtogroup DDFlushMode * @{ */ /// Enumeration of flush mode states. -enum DG_Flush_States +enum DD_Flush_States { - DG_FLUSH_STATE_START = 0, ///< Flush, start mode state - DG_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state - DG_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state - DG_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state - DG_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state - DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state - DG_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state - DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Flush, flush reservoir 2 and drain reservoir 1 state - DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE, ///< Flush, flush circulation drain line state - DG_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state - DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER, ///< Flush, flush with fresh water - DG_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state - DG_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state - DG_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state - NUM_OF_DG_FLUSH_STATES ///< Number of flush mode states + DD_FLUSH_STATE_START = 0, ///< Flush, start mode state + DD_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state + DD_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state + DD_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state + DD_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state + DD_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state + DD_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state + DD_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Flush, flush reservoir 2 and drain reservoir 1 state + DD_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE, ///< Flush, flush circulation drain line state + DD_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state + DD_FLUSH_STATE_FLUSH_WITH_FRESH_WATER, ///< Flush, flush with fresh water + DD_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state + DD_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state + DD_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state + NUM_OF_DD_FLUSH_STATES ///< Number of flush mode states }; -typedef enum DG_Flush_States DG_FLUSH_STATE_T; ///< Type for DG flush mode states enumeration +typedef enum DD_Flush_States DD_FLUSH_STATE_T; ///< Type for DD flush mode states enumeration /// Enumeration of flush mode UI states. -enum DG_Flush_UI_States +enum DD_Flush_UI_States { FLUSH_UI_STATE_NOT_RUNNING = 0, ///< Flush UI, not running state FLUSH_UI_STATE_DRAIN_DEVICE, ///< Flush UI, drain device state @@ -258,9 +258,9 @@ FLUSH_UI_STATE_COMPLETE, ///< Flush UI, complete state NUM_OF_FLUSH_UI_STATES ///< Number of flush UI states }; -typedef enum DG_Flush_UI_States DG_FLUSH_UI_STATE_T; ///< Type for DG flush mode UI states enumeration +typedef enum DD_Flush_UI_States DD_FLUSH_UI_STATE_T; ///< Type for DD flush mode UI states enumeration -#if defined(_HD_) || defined(_DG_) +#if defined(_HD_) || defined(_DD_) /// Flush mode data publish struct typedef struct { @@ -275,42 +275,42 @@ /**@}*/ /** - * @addtogroup DGHeatDisinfectMode + * @addtogroup DDHeatDisinfectMode * @{ */ /// Enumeration of heat disinfect mode states. -enum DG_Heat_States +enum DD_Heat_States { - DG_HEAT_DISINFECT_STATE_START = 0, ///< Heat disinfect, start mode state - DG_HEAT_DISINFECT_STATE_DRAIN_R1, ///< Heat disinfect, drain R1 state - DG_HEAT_DISINFECT_STATE_DRAIN_R2, ///< Heat disinfect, drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN, ///< Heat disinfect, flush drain state - DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION, ///< Heat disinfect, flush circulation state - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2, ///< Heat disinfect, flush R1 and R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Heat disinfect, flush R2 and drain R1 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2, ///< Heat disinfect, flush drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1, ///< Heat disinfect, flush drain R1 state - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER, ///< Heat disinfect, fill with water state - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, disinfect R1 to R2 state - DG_HEAT_DISINFECT_STATE_PREPARE_FOR_HOT_WATER_TRANSITION, ///< Heat disinfect, prepare for hot water transition - DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water state - DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 state - DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS, ///< Heat disinfect, cool down heaters state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 state - DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect, cancel mode basic path state - DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH, ///< Heat disinfect, cancel mode water path state - DG_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete state + DD_HEAT_DISINFECT_STATE_START = 0, ///< Heat disinfect, start mode state + DD_HEAT_DISINFECT_STATE_DRAIN_R1, ///< Heat disinfect, drain R1 state + DD_HEAT_DISINFECT_STATE_DRAIN_R2, ///< Heat disinfect, drain R2 state + DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN, ///< Heat disinfect, flush drain state + DD_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION, ///< Heat disinfect, flush circulation state + DD_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2, ///< Heat disinfect, flush R1 and R2 state + DD_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Heat disinfect, flush R2 and drain R1 state + DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2, ///< Heat disinfect, flush drain R2 state + DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1, ///< Heat disinfect, flush drain R1 state + DD_HEAT_DISINFECT_STATE_FILL_WITH_WATER, ///< Heat disinfect, fill with water state + DD_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, disinfect R1 to R2 state + DD_HEAT_DISINFECT_STATE_PREPARE_FOR_HOT_WATER_TRANSITION, ///< Heat disinfect, prepare for hot water transition + DD_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water state + DD_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 state + DD_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS, ///< Heat disinfect, cool down heaters state + DD_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 state + DD_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 state + DD_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect, cancel mode basic path state + DD_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH, ///< Heat disinfect, cancel mode water path state + DD_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete state #ifndef _RELEASE_ - DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER, + DD_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER, #endif - NUM_OF_DG_HEAT_DISINFECT_STATES ///< Number of heat disinfect mode states + NUM_OF_DD_HEAT_DISINFECT_STATES ///< Number of heat disinfect mode states }; -typedef enum DG_Heat_States DG_HEAT_DISINFECT_STATE_T; ///< Type for DG heat disinfect states enumeration +typedef enum DD_Heat_States DD_HEAT_DISINFECT_STATE_T; ///< Type for DD heat disinfect states enumeration /// Enumeration of heat disinfect mode states. -enum DG_Heat_UI_States +enum DD_Heat_UI_States { HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0, ///< Heat disinfect UI, not running state HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT, ///< Heat disinfect UI, flush before disinfect state @@ -324,9 +324,9 @@ HEAT_DISINFECT_UI_STATE_COMPLETE, ///< Heat disinfect UI, complete state NUM_OF_HEAT_DISINFECT_UI_STATES ///< Number of heat disinfect mode UI states }; -typedef enum DG_Heat_UI_States DG_HEAT_DISINFECT_UI_STATE_T; ///< Type for DG heat disinfect UI states enumeration +typedef enum DD_Heat_UI_States DD_HEAT_DISINFECT_UI_STATE_T; ///< Type for DD heat disinfect UI states enumeration -#if defined(_HD_) || defined(_DG_) +#if defined(_HD_) || defined(_DD_) /// Heat disinfect data publish struct typedef struct { @@ -355,75 +355,32 @@ /**@}*/ /** - * @addtogroup DGHeatDisinfectActiveCoolMode + * @addtogroup DDHeatDisinfectActiveCoolMode * @{ */ /// Enumeration of heat disinfect active cool mode states. -enum DG_Heat_Cool_States +enum DD_Heat_Cool_States { - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0, ///< Heat disinfect active cool, start mode state. - DG_HEAT_DISINFECT_ACITVE_COOL_MIX_DRAIN_R1_STATE, ///< Heat disinfect active cool, mix drain R1 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R2_STATE, ///< Heat disinfect active cool, mix drain R2 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R1_STATE, ///< Heat disinfect active cool, fill R1 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R2_STATE, ///< Heat disinfect active cool, fill R2 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_FILL_R1_TO_R2_STATE, ///< Heat disinfect active cool, drain R2 fill R1 to R2 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_FILL_R2_TO_R1_STATE, ///< Heat disinfect active cool, drain R1 fill R2 to R1 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE, ///< Heat disinfect active cool, drain R1 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE, ///< Heat disinfect active cool, drain R2 state. - DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE, ///< Heat disinfect active cool, cancel water path state. - DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE, ///< Heat disinfect active cool, cancel basic path state. - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE, ///< Heat disinfect active cool, complete state. - NUM_OF_DG_HEAT_DISINFECT_ACTIVE_COOL_STATES ///< Number of heat disinfect mode states. + DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0, ///< Heat disinfect active cool, start mode state. + DD_HEAT_DISINFECT_ACITVE_COOL_MIX_DRAIN_R1_STATE, ///< Heat disinfect active cool, mix drain R1 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R2_STATE, ///< Heat disinfect active cool, mix drain R2 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_FILL_R1_STATE, ///< Heat disinfect active cool, fill R1 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_FILL_R2_STATE, ///< Heat disinfect active cool, fill R2 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_FILL_R1_TO_R2_STATE, ///< Heat disinfect active cool, drain R2 fill R1 to R2 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_FILL_R2_TO_R1_STATE, ///< Heat disinfect active cool, drain R1 fill R2 to R1 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE, ///< Heat disinfect active cool, drain R1 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE, ///< Heat disinfect active cool, drain R2 state. + DD_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE, ///< Heat disinfect active cool, cancel water path state. + DD_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE, ///< Heat disinfect active cool, cancel basic path state. + DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE, ///< Heat disinfect active cool, complete state. + NUM_OF_DD_HEAT_DISINFECT_ACTIVE_COOL_STATES ///< Number of heat disinfect mode states. }; -typedef enum DG_Heat_Cool_States DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_T; ///< Type for DG heat disinfect active cool states enumeration +typedef enum DD_Heat_Cool_States DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_T; ///< Type for DD heat disinfect active cool states enumeration /**@}*/ -/** - * @addtogroup DGChemicalDisinfectMode - * @{ - */ - -/// Enumeration of chemical disinfect mode states. -enum DG_Chem_States -{ - DG_CHEM_DISINFECT_STATE_START = 0, ///< Chemical disinfect, start state - DG_CHEM_DISINFECT_STATE_DRAIN_R1, ///< Chemical disinfect, drain R1 state - DG_CHEM_DISINFECT_STATE_DRAIN_R2, ///< Chemical disinfect, drain R2 state - DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN, ///< Chemical disinfect, flush drain state - DG_CHEM_DISINFECT_STATE_DEPRIME_ACID_LINE, ///< Chemical disinfect, de-prime acid line state - DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION, ///< Chemical disinfect, flush circulation state - DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT, ///< Chemical disinfect, prime disinfectant state - DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH, ///< Chemical disinfect, disinfectant flush state - DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT, ///< Chemical disinfect, fill with disinfectant state - DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Chemical disinfect, fill R1 with disinfectant, overflow to R2 - DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1, ///< Chemical disinfect, fill R2 with disinfectant, partial drain R1 - DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Chemical disinfect, fill R2 with disinfectant, overflow to R1 - DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2, ///< Chemical disinfect, fill R1 with disinfectant, partial drain R2 - DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Chemical disinfect, cancel basic path state - DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH, ///< Chemical disinfect, cancel water path state - DG_CHEM_DISINFECT_STATE_COMPLETE, ///< Chemical disinfect, complete state - NUM_OF_DG_CHEM_DISINFECT_STATES ///< Number of chemical disinfect mode states -}; -typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T; ///< Type for DG chemical disinfect states enumeration - -/// Enumeration of chemical disinfect mode UI states -enum DG_Chem_UI_States -{ - CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0, ///< Chemical disinfect UI, not running state - CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT, ///< Chemical disinfect UI, flush before disinfect state - CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID, ///< Chemical disinfect UI, mix water and acid state - CHEM_DISINFECT_UI_STATE_REMOVE_ACID, ///< Chemical disinfect UI, remove acid state - CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE, ///< Chemical disinfect UI, disinfect device state - CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT, ///< Chemical disinfect UI, flush after disinfect state - CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT, ///< Chemical disinfect UI, cancel disinfect state - CHEM_DISINFECT_UI_STATE_COMPLETE, ///< Chemical disinfect UI, complete state - NUM_OF_CHEM_DISINFECT_UI_STATES ///< Number of chemical disinfect UI states -}; -typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T; ///< Type for DG chemical disinfect UI states enumeration - -#if defined(_HD_) || defined(_DG_) +#if defined(_HD_) || defined(_DD_) /// Chemical disinfect data typedef struct { @@ -439,42 +396,7 @@ /**@}*/ -/** - * @addtogroup DGChemicalDisinfectFlushMode - * @{ - */ - -/// Enumeration of chemical disinfect flush mode states. -enum DG_Chem_Flush_States -{ - DG_CHEM_DISINFECT_FLUSH_STATE_START = 0, ///< Chemical disinfect flush, start state - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1, ///< Chemical disinfect flush, drain R1 state - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2, ///< Chemical disinfect flush, drain R2 state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN, ///< Chemical disinfect flush, flush drain state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE, ///< Chemical disinfect flush, flush disinfectant line state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF, ///< Chemical disinfect flush, flush UF state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1, ///< Chemical disinfect flush, flush R2 to R1 drain R1 state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2, ///< Chemical disinfect flush, flush R1 to R2 drain R2 state - DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2, ///< Chemical disinfect flush, sample flush R1 to R2 drain R2 state - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Chemical disinfect flush, cancel basic path state - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH, ///< Chemical disinfect flush, cancel water path state - DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE, ///< Chemical disinfect flush, complete state - NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES ///< Number of chemical disinfect flush mode states -}; -typedef enum DG_Chem_Flush_States DG_CHEM_DISINFECT_FLUSH_STATE_T; ///< Type for DG chemical disinfect flush states enumeration - -/// Enumeration of chemical disinfect flush mode UI states -enum DG_Chem_Flush_UI_States -{ - CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING = 0, ///< Chemical disinfect flush UI, not running state - CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT, ///< Chemical disinfect flush UI, flush after disinfect state - CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH, ///< Chemical disinfect flush UI, cancel disinfect state - CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE, ///< Chemical disinfect flush UI, complete state - NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES ///< Number of chemical disinfect flush UI states -}; -typedef enum DG_Chem_Flush_UI_States DG_CHEM_DISINFECT_FLUSH_UI_STATE_T; ///< Type for DG chemical disinfect UI states enumeration - -#if defined(_HD_) || defined(_DG_) +#if defined(_HD_) || defined(_DD_) /// Chemical disinfect flush data typedef struct { @@ -490,27 +412,27 @@ /**@}*/ /** - * @addtogroup DGROPermeateSampleMode + * @addtogroup DDROPermeateSampleMode * @{ */ /// Enumeration of RO permeate mode. -enum DG_RO_Permeate_States +enum DD_RO_Permeate_States { - DG_RO_PERM_SAMPLE_STATE_START = 0, ///< RO Permeate Sample, start mode state - DG_RO_PERM_SAMPLE_STATE_DRAIN_R1, ///< RO Permeate Sample, drain reservoir 1 state - DG_RO_PERM_SAMPLE_STATE_DRAIN_R2, ///< RO Permeate Sample, drain reservoir 2 state - DG_RO_PERM_SAMPLE_STATE_FLUSH_DRAIN, ///< RO Permeate Sample, flush drain state - DG_RO_PERM_SAMPLE_STATE_FLUSH_DIALYSATE, ///< RO Permeate Sample, flush dialysate state - DG_RO_PERM_SAMPLE_STATE_FLUSH_CONCENTRATE_STRAWS, ///< RO Permeate Sample, flush concentrate straws state - DG_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1, ///< RO Permeate Sample, flush R2 to R1 and drain R1 state - DG_RO_PERM_SAMPLE_STATE_COLLECT_SAMPLE, ///< RO Permeate Sample, collect sample state - DG_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH, ///< RO Permeate Sample, cancel basic path state - DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH, ///< RO Permeate Sample, cancel water path state - DG_RO_PERM_SAMPLE_STATE_COMPLETE, ///< RO Permeate Sample, complete mode state - NUM_OF_DG_RO_PERM_STATES ///< Number of RO permeate mode states + DD_RO_PERM_SAMPLE_STATE_START = 0, ///< RO Permeate Sample, start mode state + DD_RO_PERM_SAMPLE_STATE_DRAIN_R1, ///< RO Permeate Sample, drain reservoir 1 state + DD_RO_PERM_SAMPLE_STATE_DRAIN_R2, ///< RO Permeate Sample, drain reservoir 2 state + DD_RO_PERM_SAMPLE_STATE_FLUSH_DRAIN, ///< RO Permeate Sample, flush drain state + DD_RO_PERM_SAMPLE_STATE_FLUSH_DIALYSATE, ///< RO Permeate Sample, flush dialysate state + DD_RO_PERM_SAMPLE_STATE_FLUSH_CONCENTRATE_STRAWS, ///< RO Permeate Sample, flush concentrate straws state + DD_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1, ///< RO Permeate Sample, flush R2 to R1 and drain R1 state + DD_RO_PERM_SAMPLE_STATE_COLLECT_SAMPLE, ///< RO Permeate Sample, collect sample state + DD_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH, ///< RO Permeate Sample, cancel basic path state + DD_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH, ///< RO Permeate Sample, cancel water path state + DD_RO_PERM_SAMPLE_STATE_COMPLETE, ///< RO Permeate Sample, complete mode state + NUM_OF_DD_RO_PERM_STATES ///< Number of RO permeate mode states }; -typedef enum DG_RO_Permeate_States DG_RO_PERM_STATE_T; ///< Type for DG RO Permeate states enumeration +typedef enum DD_RO_Permeate_States DD_RO_PERM_STATE_T; ///< Type for DD RO Permeate states enumeration /**@}*/ @@ -530,7 +452,7 @@ /**@}*/ /** - * @addtogroup DGInterface + * @addtogroup DDInterface * @{ */ @@ -554,35 +476,17 @@ typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T; ///< Type for sample water enum. /// Enumeration of sample water command parameters. -enum DG_General_Commands +enum DD_General_Commands { - DG_CMD_STOP = 0, ///< DG general stop command - DG_CMD_START = 1, ///< DG general start command - NUM_OF_DG_CMDS ///< Number of DG general commands + DD_CMD_STOP = 0, ///< DD general stop command + DD_CMD_START = 1, ///< DD general start command + NUM_OF_DD_CMDS ///< Number of DD general commands }; -typedef enum DG_General_Commands DG_GENERAL_COMMAND_T; ///< Type for DG general command enum. +typedef enum DD_General_Commands DD_GENERAL_COMMAND_T; ///< Type for DD general command enum. /**@}*/ /** - * @addtogroup LoadCells - * @{ - */ - -/// Enumeration of DG load cell sensors. -typedef enum Load_Cells -{ - LOAD_CELL_FIRST = 0, ///< First load cell to scan - LOAD_CELL_RESERVOIR_1_PRIMARY = LOAD_CELL_FIRST, ///< Primary load cell for reservoir 1. - LOAD_CELL_RESERVOIR_1_BACKUP, ///< Backup load cell for reservoir 1. - LOAD_CELL_RESERVOIR_2_PRIMARY, ///< Primary load cell for reservoir 2. - LOAD_CELL_RESERVOIR_2_BACKUP, ///< Backup load cell for reservoir 2. - NUM_OF_LOAD_CELLS ///< Number of load cell sensors. -} LOAD_CELL_ID_T; - -/**@}*/ - -/** * @addtogroup CommonHeader * @{ */ Index: MsgDefs.h =================================================================== diff -u -r971a6403f186c78d7453f2517bf56737a283a7ab -r22c198bec7c2e7bb993e68d930a567bd8f26c36f --- MsgDefs.h (.../MsgDefs.h) (revision 971a6403f186c78d7453f2517bf56737a283a7ab) +++ MsgDefs.h (.../MsgDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) @@ -56,6 +56,7 @@ MSG_ID_DD_EVENT = 0x18, ///< DD general event MSG_ID_TD_DD_ALARMS_REQUEST = 0x19, ///< TD request for DD to re-send trigger messages for each active alarm MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x20, ///< UI TD reset in service mode request + MSG_ID_DD_VALVES_STATES_DATA = 0x21, ///< DD broadcast valve states // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID