Index: DGDefs.h =================================================================== diff -u -r07e22db44987cf7c7300009b3ff101189d185727 -rc108a97777b0b994af3d98725c1e339423326b6d --- DGDefs.h (.../DGDefs.h) (revision 07e22db44987cf7c7300009b3ff101189d185727) +++ DGDefs.h (.../DGDefs.h) (revision c108a97777b0b994af3d98725c1e339423326b6d) @@ -7,8 +7,8 @@ * * @file DGDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 09-Oct-2023 +* @author (last) Dara Navaei +* @date (last) 15-Jul-2024 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -215,10 +215,12 @@ enum DG_Disinfect_States { DG_DISINFECT_FLUSH_STATE = 0, ///< DG disinfect flush - DG_DISINFECT_HEAT_STATE, ///< DG disinfect heat + DG_DISINFECT_HEAT_STATE_ACTIVE_COOL, ///< DG disinfect heat with active cool 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_HEAT_STATE_PASSIVE_COOL, ///< DG disinfect heat with passive cool + DG_DISINFECT_ACTIVE_COOL, ///< DG disinfect active cool DG_DISINFECT_NOT_RUNNING_STATE, ///< DG disinfect not running NUM_OF_DG_DISINFECT_STATES ///< Number of DG disinfect states }; @@ -543,30 +545,32 @@ /// Enumeration of available DG commands. enum DG_Command { - DG_CMD_NONE = 0, ///< Not a command - DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs - DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain - DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain - DG_CMD_START_FILL = 4, ///< Command to request DG to start fill - DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill - DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater - DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater - DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings - DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water - DG_CMD_START_FLUSH = 10, ///< Command to request DG to start flush - DG_CMD_STOP_FLUSH = 11, ///< Command to request DG to stop flush - DG_CMD_START_HEAT_DISINFECT = 12, ///< Command to request DG to start heat disinfect - DG_CMD_STOP_HEAT_DISINFECT = 13, ///< Command to request DG to stop heat disinfect - DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect - DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect - DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios - DG_CMD_START_CHEM_DISINFECT_FLUSH = 17, ///< Command to request DG to start chemical disinfect - DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18, ///< Command to request DG to stop chemical disinfect - DG_CMD_START_RO_PERMEATE_SAMPLE = 19, ///< Command to request DG to start RO permeate sample mode - DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20, ///< Command to request DG to stop RO permeate sample mode - DG_CMD_STOP_ACTIVE_COOL = 21, ///< Command to request DG to stop active cool mode - DG_CMD_PARK_CONCENTRATE_PUMPS = 22, ///< Command to request DG to park concentrate pumps - NUM_OF_DG_COMMANDS ///< Number of DG commands + DG_CMD_NONE = 0, ///< Not a command + DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs + DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain + DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain + DG_CMD_START_FILL = 4, ///< Command to request DG to start fill + DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill + DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater + DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater + DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings + DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water + DG_CMD_START_FLUSH = 10, ///< Command to request DG to start flush + DG_CMD_STOP_FLUSH = 11, ///< Command to request DG to stop flush + DG_CMD_START_HEAT_DISINFECT_ACTIVE_COOL = 12, ///< Command to request DG to start heat disinfect with active cool + DG_CMD_STOP_HEAT_DISINFECT = 13, ///< Command to request DG to stop heat disinfect + DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect + DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios + DG_CMD_START_CHEM_DISINFECT_FLUSH = 17, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18, ///< Command to request DG to stop chemical disinfect + DG_CMD_START_RO_PERMEATE_SAMPLE = 19, ///< Command to request DG to start RO permeate sample mode + DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20, ///< Command to request DG to stop RO permeate sample mode + DG_CMD_STOP_ACTIVE_COOL = 21, ///< Command to request DG to stop active cool mode + DG_CMD_PARK_CONCENTRATE_PUMPS = 22, ///< Command to request DG to park concentrate pumps + DG_CMD_START_HEAT_DISINFECT_PASSIVE_COOL = 23, ///< Command to request DG to start heat disinfect with passive cool + DG_CMD_START_ACTIVE_COOL = 24, ///< Command to request DG to start heat disinfect active cool + NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration @@ -668,6 +672,10 @@ DG_EVENT_RESERVOIR_FILL_VALUES, ///< DG reservoir fill values DG_EVENT_OPERATION_STATUS, ///< DG operation status event DG_EVENT_TEMPERATURE_DRIFT, ///< DG temperature drift event + DG_EVENT_BICARB_CHECK_RESULT, ///< DG bicarb check result + DG_EVENT_ACID_CHECK_RESULT, ///< DG acid check result + DG_EVENT_COND1_VS_COND2_DIFF_RESULT, ///< DG CD1 (acid) vs. CD2 (bicarb) different result + DG_EVENT_PASSIVE_COOL_HEAT_DISINFECT_STATUS, ///< DG passive cool heat disinfect status NUM_OF_DG_EVENT_IDS ///< Total number of DG events }; typedef enum DG_Event_List DG_EVENT_ID_T; ///< Type for DG event list enumeration