Index: DGDefs.h =================================================================== diff -u -re9beb6b7cbe88dfd9c38ef0ca9f4724ca28916a3 -r656fa9161aa0912c10dd59700f7d1c25b984e16f --- DGDefs.h (.../DGDefs.h) (revision e9beb6b7cbe88dfd9c38ef0ca9f4724ca28916a3) +++ DGDefs.h (.../DGDefs.h) (revision 656fa9161aa0912c10dd59700f7d1c25b984e16f) @@ -398,6 +398,7 @@ 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 @@ -413,21 +414,6 @@ }; 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_) /// Chemical disinfect data typedef struct @@ -438,7 +424,7 @@ U32 cancellationMode; ///< Chemical disinfect cancellation mode. F32 R1FillLevel; ///< Reservoir 1 level upon starting the chemical disinfect. F32 R2FillLevel; ///< Reservoir 2 level upon starting the chemical disinfect. - U32 chemDisinfectUIState; ///< Chemical disinfect UI state. + F32 acidAvgCondUSPCM; ///< Acid average conductivity in uS/cm. } MODE_CHEMICAL_DISINFECT_DATA_T; #endif