Index: DGDefs.h =================================================================== diff -u -r35f81d848a7983f7272feab7bce35fb0be2d88d0 -r6c2740ce90a21745d887e43be822a97154ae5596 --- DGDefs.h (.../DGDefs.h) (revision 35f81d848a7983f7272feab7bce35fb0be2d88d0) +++ DGDefs.h (.../DGDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) @@ -8,7 +8,7 @@ * @file DGDefs.h * * @author (last) Dara Navaei -* @date (last) 21-Dec-2022 +* @date (last) 31-May-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -41,6 +41,7 @@ DG_MODE_CHEM, ///< Chemical Disinfect mode DG_MODE_CHFL, ///< Chemical Disinfect Flush mode DG_MODE_HCOL, ///< Heat disinfect cooling mode + DG_MODE_ROPS, ///< RO permeate sample mode DG_MODE_NLEG, ///< Not legal - an illegal mode transition occurred NUM_OF_DG_MODES ///< Number of DG operation modes }; @@ -129,6 +130,7 @@ DG_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state DG_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state + DG_STANDBY_MODE_STATE_PAUSE, ///< Pause state NUM_OF_DG_STANDBY_MODE_STATES ///< Number of standby mode states }; typedef enum DG_Standby_Mode_States DG_STANDBY_MODE_STATE_T; ///< Type for DG standby mode states enumeration @@ -216,6 +218,8 @@ 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 }; @@ -304,6 +308,9 @@ 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 +#ifndef _RELEASE_ + DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER, +#endif NUM_OF_DG_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 @@ -339,6 +346,18 @@ } MODE_HEAT_DISINFECT_DATA_T; #endif +/// Cancellation paths +typedef enum Cancellation_modes +{ + CANCELLATION_MODE_NONE = 0, ///< Cancellation mode none. + CANCELLATION_MODE_BASIC, ///< Cancellation mode basic. + CANCELLATION_MODE_HOT, ///< Cancellation mode hot. + CANCELLATION_MODE_COLD, ///< Cancellation mode cold. + CANCELLATION_MODE_CHEMICAL, ///< Cancellation mode chemical. + CANCELLATION_MODE_WATER, ///< Cancellation mode water. + NUM_OF_CANCELLATION_MODES ///< Number of cancellation modes. +} CANCELLATION_MODE_T; + /**@}*/ /** @@ -349,11 +368,19 @@ /// Enumeration of heat disinfect active cool mode states. enum DG_Heat_Cool_States { - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0, ///< Heat disinfect active cool, start mode state - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COOL_DOWN_RO_FILTER, ///< Heat disinfect active cool, cool down RO filter state - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect active cool, cancel mode 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 + 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. }; typedef enum DG_Heat_Cool_States DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_T; ///< Type for DG heat disinfect active cool states enumeration @@ -425,7 +452,7 @@ /// Enumeration of chemical disinfect flush mode states. enum DG_Chem_Flush_States { - DG_CHEM_DISINFECT_FLUSH_STATE_START = 0, ///< Chemical disinfect, start state + 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 @@ -468,6 +495,31 @@ /**@}*/ /** + * @addtogroup DGROPermeateSampleMode + * @{ + */ + +/// Enumeration of RO permeate mode. +enum DG_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 +}; +typedef enum DG_RO_Permeate_States DG_RO_PERM_STATE_T; ///< Type for DG RO Permeate states enumeration + +/**@}*/ + +/** * @addtogroup DGServiceMode * @{ */ @@ -509,6 +561,8 @@ 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 NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration @@ -576,11 +630,12 @@ /// Enumeration of DG load cell sensors. typedef enum Load_Cells { - LOAD_CELL_RESERVOIR_1_PRIMARY = 0, ///< 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_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; /**@}*/ @@ -606,6 +661,9 @@ DG_EVENT_SW_CONFIG_UPDATE, ///< DG new software configuration has been updated DG_EVENT_SCHEDULED_RUNS_UPDATE, ///< DG new scheduled runs information has been updated DG_EVENT_HEATERS_INFO_UPDATE, ///< DG new heaters information has been updated + 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 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 @@ -631,4 +689,18 @@ /**@}*/ +#ifndef _RELEASE_ +// Nelson lab disinfect efficacy support +typedef enum Nelson_States +{ + NELSON_NONE = 0, // Nelson none. + NELSON_INOCULATE, // Nelson inoculate. + NELSON_HEAT_DISINFECT, // Nelson heat disinfect. + NELSON_POS_CONTROL_HEAT_DISINFECT, // Nelson positive control heat disinfect. + NELSON_CHEM_DISINFECT, // Nelson chemical disinfect. + NELSON_DRAIN_SAMPLES, // Nelson drain sample. + NUM_OF_NELSON_SUPPORT // Number of Nelson supports. +} NELSON_SUPPORT_T; #endif + +#endif