Index: AlarmDefs.h =================================================================== diff -u -r00a994bd6c814621838f6b1d63f7419469cc6c4f -r2114d3eef5009ab52c4c49a1d75a1130be2eaa91 --- AlarmDefs.h (.../AlarmDefs.h) (revision 00a994bd6c814621838f6b1d63f7419469cc6c4f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2114d3eef5009ab52c4c49a1d75a1130be2eaa91) @@ -291,7 +291,7 @@ ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253, ///< DG invalid system record ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC = 254, ///< DG invalid service record ALARM_ID_HD_UI_COMPATIBILITY_ERROR = 255, ///< HD and UI software builds are not compatible - ALARM_ID_AVAILABLE_2 = 256, ///< Alarm ID available for use + ALARM_ID_HD_DISINFECT_CHEM_FLUSH = 256, ///< HD processor is in Disinfect Chemical Flush mode ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257, ///< DG FPGA power out timeout ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258, ///< HD FPGA power out timeout ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259, ///< HD temperatures out of range @@ -742,7 +742,7 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM_FLUSH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -945,7 +945,6 @@ { 3, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_UI_COMPATIBILITY_ERROR }, - { 3, ALARM_ID_AVAILABLE_2 }, { 3, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT }, { 3, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT }, { 3, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE }, @@ -1135,6 +1134,7 @@ { 999, ALARM_ID_HD_DISINFECT_FLUSH }, { 999, ALARM_ID_HD_DISINFECT_HEAT }, { 999, ALARM_ID_HD_DISINFECT_CHEM }, + { 999, ALARM_ID_HD_DISINFECT_CHEM_FLUSH }, { 999, ALARM_ID_NO_ALARM }, }; @@ -1415,7 +1415,7 @@ { 253 , ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC , "DG | Machine Error | Call service to schedule a repair. | DG invalid system record | If the calculated CRC of the DG system record image does not match the expected CRC. | "}, { 254 , ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC , "DG | Machine Error | Call service to schedule a repair. | DG invalid service record | If the calculated CRC of the DG service record image does not match the expected CRC. | "}, { 255 , ALARM_ID_HD_UI_COMPATIBILITY_ERROR , "HD | Machine Error | Call service to schedule a repair. | HD and UI software builds are not compatible | If the compatibility revision field of the UI is not equal to SW_COMPATIBILITY_REV. | "}, - { 256 , ALARM_ID_AVAILABLE_2 , "N/A | N/A | N/A | N/A | N/A | "}, + { 256 , ALARM_ID_HD_DISINFECT_CHEM_FLUSH , "HD | Cleaning Modes Start Alarm | No Instructions | DG chemical disinfect flush started | If DG chemical disinfect flush successfully started from the UI. | "}, { 257 , ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT , "DG | Machine Error | Call service to schedule a repair. | DG FPGA power out timeout | If the FPGA power gpio status pin has a logic '0' for more than 2 seconds. | "}, { 258 , ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT , "HD | Machine Error | Call service to schedule a repair. | HD FPGA power out timeout | If the FPGA power gpio status pin has a logic '0' for more than 2 seconds. | "}, { 259 , ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE , "HD | Temperature Sensors Error | Call service to schedule a repair. | HD temperatures out of range | If thermistor reports temperature > 80.0 C or < 0.0 C for a certain period of time. | "}, Index: HDDefs.h =================================================================== diff -u -rc1f28621ec5b4ca6ea1902e91de1abf4207ad934 -r2114d3eef5009ab52c4c49a1d75a1130be2eaa91 --- HDDefs.h (.../HDDefs.h) (revision c1f28621ec5b4ca6ea1902e91de1abf4207ad934) +++ HDDefs.h (.../HDDefs.h) (revision 2114d3eef5009ab52c4c49a1d75a1130be2eaa91) @@ -776,9 +776,11 @@ enum Generic_Confirm_Id { GENERIC_CONFIRM_ID_NONE = 0, ///< Generic Confirm None - GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH, ///< water flush stop user confirmation - GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT, ///< Heat disinfect stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH, ///< water flush stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT, ///< Heat disinfect stop user confirmation GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL, ///< Chemical disinfect stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH, ///< Chemical disinfect flush stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL, ///< Chemical disinfect sample flush pass/fail NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs }; typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration Index: MsgDefs.h =================================================================== diff -u -rc1f28621ec5b4ca6ea1902e91de1abf4207ad934 -r2114d3eef5009ab52c4c49a1d75a1130be2eaa91 --- MsgDefs.h (.../MsgDefs.h) (revision c1f28621ec5b4ca6ea1902e91de1abf4207ad934) +++ MsgDefs.h (.../MsgDefs.h) (revision 2114d3eef5009ab52c4c49a1d75a1130be2eaa91) @@ -229,6 +229,7 @@ MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5, ///< DG heat disinfect active cool data broadcast MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6, ///< DG heat disinfect active cool start/stop command MSG_ID_HD_AIR_PUMP_DATA = 0xC7, ///< HD air pump data publish + MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG = 0xC8, ///< HD send chemical disinfect flush sample pass/fail to DG #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing