Index: DGDefs.h =================================================================== diff -u -r9c105f31997faac411ab7b7580b039e2b9215964 -ra054624b9ea844aac1cb7a0f5a9c12f1e4c3b925 --- DGDefs.h (.../DGDefs.h) (revision 9c105f31997faac411ab7b7580b039e2b9215964) +++ DGDefs.h (.../DGDefs.h) (revision a054624b9ea844aac1cb7a0f5a9c12f1e4c3b925) @@ -396,8 +396,6 @@ 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 postDisinfectTargetRinseCount; ///< Target post disinfect rinse count. - U32 postDisinfectCurrentRinseCount; ///< Current post disinfect rinse count. U32 chemDisinfectUIState; ///< Chemical disinfect UI state. } MODE_CHEMICAL_DISINFECT_DATA_T; #endif @@ -431,11 +429,11 @@ /// 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 + 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 @@ -447,11 +445,8 @@ U32 overallElapsedTime; ///< Overall elapsed time in chemical disinfect flush mode. U32 stateElapsedTime; ///< Current chemical disinfect flush elapsed time. U32 cancellationMode; ///< Chemical disinfect flush cancellation mode. - F32 R1FillLevel; ///< Reservoir 1 level upon starting the chemical disinfect flush. - F32 R2FillLevel; ///< Reservoir 2 level upon starting the chemical disinfect flush. - U32 postDisinfectTargetRinseCount; ///< Target post disinfect rinse count. U32 postDisinfectCurrentRinseCount; ///< Current post disinfect rinse count. - U32 chemDisinfectFlushUIState; ///< Chemical disinfect flush UI state. + U32 chemDisinfectFlushUIState; ///< Chemical disinfect flush UI state. } MODE_CHEMICAL_DISINFECT_FLUSH_DATA_T; #endif