Index: AlarmDefs.h =================================================================== diff -u -r26d52d21ce920c9460fa268903374a3aa7623c48 -r811deed4a156904f45a277c1c729bdaa23a741ca --- AlarmDefs.h (.../AlarmDefs.h) (revision 26d52d21ce920c9460fa268903374a3aa7623c48) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 811deed4a156904f45a277c1c729bdaa23a741ca) @@ -282,7 +282,7 @@ ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 244, ///< DG temperature sensors difference out of range ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT = 245, ///< DG heat disinfect target temperature time out (could not reach to temperature) ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 246, ///< DG heat disinfect inlet pressure and temperature sensors out of range - ALARM_ID__AVAILABLE_3 = 247, ///< Alarm ID available for use + ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT = 247, ///< DG heat disinfect active cool time tour ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 248, ///< DG chemical disinfect could not reach to target temperature ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 249, ///< DG chemical disinfect inlet pressure and temperature sensors out of range ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 250, ///< DG chemical disinfect inlet conductivity and temperature out of range @@ -726,7 +726,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, @@ -990,7 +990,7 @@ { 3, ALARM_ID_HD_RTC_CONFIG_ERROR }, { 3, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT }, { 3, ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, - { 3, ALARM_ID__AVAILABLE_3 }, + { 3, ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT }, { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, { 3, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, @@ -1387,7 +1387,7 @@ { 244 , ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG temperature sensors difference out of range | If any of the temperature sensors are out of the average of the sensors by more than 3 C. | "}, { 245 , ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG heat disinfect target temperature time out (could not reach to temperature) | If heating up to minimum temperature for heat disinfect failed after 4 hours. | "}, { 246 , ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG heat disinfect inlet pressure and temperature sensors out of range | If the inlet pressure < 30 psi and the difference in between TDi and TRo > 3 C. | "}, - { 247 , ALARM_ID__AVAILABLE_3 , "N/A | N/A | N/A | N/A | N/A | "}, + { 247 , ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT , "DG | Heat Disinfection Active Cool Error | Call service to schedule a repair. | DG heat disinfect active cool time out | If THd > 44 C after 90 minutes of cooling. | "}, { 248 , ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect could not reach to target temperature | If heating up to minimum temperature for chemical disinfect failed | "}, { 249 , ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect inlet pressure and temperature sensors out of range | If the inlet pressure is less than the threshold of 30.0 PSI and TDi and TRo difference is greater than 3 C | "}, { 250 , ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect inlet conductivity and temperature out of range | If couldn't get a good water sample after a couple of trials and the disinfect cycle failed | "}, Index: DGDefs.h =================================================================== diff -u -r26d52d21ce920c9460fa268903374a3aa7623c48 -r811deed4a156904f45a277c1c729bdaa23a741ca --- DGDefs.h (.../DGDefs.h) (revision 26d52d21ce920c9460fa268903374a3aa7623c48) +++ DGDefs.h (.../DGDefs.h) (revision 811deed4a156904f45a277c1c729bdaa23a741ca) @@ -39,6 +39,8 @@ DG_MODE_FLUS, ///< Flush mode DG_MODE_HEAT, ///< Heat Disinfect mode DG_MODE_CHEM, ///< Chemical Disinfect mode + DG_MODE_CHFL, ///< Chemical Disinfect Flush mode + DG_MODE_HCOL, ///< Heat disinfect cooling mode DG_MODE_NLEG, ///< Not legal - an illegal mode transition occurred NUM_OF_DG_MODES ///< Number of DG operation modes }; @@ -341,6 +343,24 @@ /**@}*/ /** + * @addtogroup DGHeatDisinfectActiveCoolMode + * @{ + */ + +/// 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 +}; +typedef enum DG_Heat_Cool_States DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_T; ///< Type for DG heat disinfect active cool states enumeration + +/**@}*/ + +/** * @addtogroup DGChemicalDisinfectMode * @{ */ Index: MsgDefs.h =================================================================== diff -u -r92e40b0163b3c79f5065671ae3ab0e77b53541b8 -r811deed4a156904f45a277c1c729bdaa23a741ca --- MsgDefs.h (.../MsgDefs.h) (revision 92e40b0163b3c79f5065671ae3ab0e77b53541b8) +++ MsgDefs.h (.../MsgDefs.h) (revision 811deed4a156904f45a277c1c729bdaa23a741ca) @@ -221,6 +221,7 @@ MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE, ///< HD battery management logging data MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF, ///< HD battery status logging data + MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC0, ///< DG heat disinfect active cool data broadcast #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing