Index: DGDefs.h =================================================================== diff -u -r2087a70ec38459f630a54db5ab385147f395c7e3 -r22e8d7a61a645af4f2c6b7c053ab369b01d7e0aa --- DGDefs.h (.../DGDefs.h) (revision 2087a70ec38459f630a54db5ab385147f395c7e3) +++ DGDefs.h (.../DGDefs.h) (revision 22e8d7a61a645af4f2c6b7c053ab369b01d7e0aa) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file DGDefs.h * -* @author (last) Dara Navaei -* @date (last) 26-Jun-2023 +* @author (last) Michael Garthwaite +* @date (last) 09-Oct-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -174,8 +174,7 @@ /// Enumeration of fill mode states. enum DG_Fill_Mode_States { - DG_FILL_MODE_STATE_START = 0, ///< Start fill mode state - DG_FILL_MODE_STATE_TEST_INLET_WATER, ///< Test inlet water quality state + 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 @@ -300,6 +299,7 @@ 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 @@ -536,7 +536,7 @@ /**@}*/ /** - * @addtogroup DGCommand + * @addtogroup DGInterface * @{ */ @@ -565,6 +565,7 @@ 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 }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration @@ -666,6 +667,7 @@ DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES, ///< DG average dialysate fill conductivity values 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_INACTIVE_RESERVOIR_TEMP_REMOVE, // TODO remove NUM_OF_DG_EVENT_IDS ///< Total number of DG events };