Index: DGDefs.h =================================================================== diff -u -r6c2740ce90a21745d887e43be822a97154ae5596 -r2087a70ec38459f630a54db5ab385147f395c7e3 --- DGDefs.h (.../DGDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) +++ DGDefs.h (.../DGDefs.h) (revision 2087a70ec38459f630a54db5ab385147f395c7e3) @@ -8,7 +8,7 @@ * @file DGDefs.h * * @author (last) Dara Navaei -* @date (last) 31-May-2023 +* @date (last) 26-Jun-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -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 @@ -438,7 +439,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 @@ -553,7 +554,7 @@ 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 flu + 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 @@ -563,6 +564,7 @@ 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 NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration @@ -664,6 +666,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_INACTIVE_RESERVOIR_TEMP_REMOVE, // TODO remove 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