Index: AlarmDefs.h =================================================================== diff -u -r18a4501e28709427bb8c6c53759d35e2536a4c42 -r6a2b7e815550b78f472675f1edfbef781c9ac436 --- AlarmDefs.h (.../AlarmDefs.h) (revision 18a4501e28709427bb8c6c53759d35e2536a4c42) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6a2b7e815550b78f472675f1edfbef781c9ac436) @@ -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_HD_DG_COMPATIBILITY_ERROR = 256, ///< HD and DG software builds are not compatible + ALARM_ID_AVAILABLE_2 = 256, ///< Alarm ID available for use 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 @@ -739,7 +739,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_HD_DG_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_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 }, @@ -939,7 +939,7 @@ { 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_HD_DG_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 }, @@ -1405,7 +1405,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_HD_DG_COMPATIBILITY_ERROR , "DG | Self-Test Error | Call service to schedule a repair. | HD and DG software builds are not compatible | This alarm is not used in the HD/DG code | "}, + { 256 , ALARM_ID_AVAILABLE_2 , "N/A | N/A | N/A | N/A | N/A | "}, { 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 -r18a4501e28709427bb8c6c53759d35e2536a4c42 -r6a2b7e815550b78f472675f1edfbef781c9ac436 --- HDDefs.h (.../HDDefs.h) (revision 18a4501e28709427bb8c6c53759d35e2536a4c42) +++ HDDefs.h (.../HDDefs.h) (revision 6a2b7e815550b78f472675f1edfbef781c9ac436) @@ -747,6 +747,8 @@ HD_EVENT_SERVICE_UPDATE, ///< HD new service record has been updated HD_EVENT_USAGE_INFO_UPDATE, ///< HD new usage information has been updated HD_EVENT_SW_CONFIG_UPDATE, ///< HD new software configuration has been updated + HD_EVENT_BUTTON, ///< HD button pressed/released + HD_EVENT_SAFETY_LINE, ///< HD safety line pulled/released HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES, ///< HD reservoir 1 load cells start values HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES, ///< HD reservoir 2 load cells end values HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES, ///< HD reservoir 2 load cells start values Index: MsgDefs.h =================================================================== diff -u -r18a4501e28709427bb8c6c53759d35e2536a4c42 -r6a2b7e815550b78f472675f1edfbef781c9ac436 --- MsgDefs.h (.../MsgDefs.h) (revision 18a4501e28709427bb8c6c53759d35e2536a4c42) +++ MsgDefs.h (.../MsgDefs.h) (revision 6a2b7e815550b78f472675f1edfbef781c9ac436) @@ -535,6 +535,7 @@ REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED = 49, ///< DG chemical flush is not complete REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 50, ///< DG RO filter temperature out of range + REQUEST_REJECT_REASON_DG_INCOMPATIBLE = 51, ///< DG firmware version is not compatible with HD firmware NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration