Index: AlarmDefs.h =================================================================== diff -u -r5c2889b1345d4c8cf293f7559f760f8a5665a3ea -re887d8a4f81f546eef9ba436814c39bfde995ffc --- AlarmDefs.h (.../AlarmDefs.h) (revision 5c2889b1345d4c8cf293f7559f760f8a5665a3ea) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e887d8a4f81f546eef9ba436814c39bfde995ffc) @@ -1114,11 +1114,15 @@ #endif // included by AlarmMgmt.c #ifdef __MANUAL_ALARMS__ +// Manual alarm table. These fields must be filled by a user even if we have to get the data from other departments +// This part is only compiled when the checkAlarms.sh creates a .c file to check the alarm tables. This code is not used in the firmware. +// The character fields are separated by | instead of , so the parser script can distinguish the end of each field column from the other it does not +// get confused with the , in the text. struct AlarmsManualRecord { - U32 alarmNumber; ///< Alarm number - ALARM_ID_T alarmID; ///< Alarm ID - char field[9000]; ///< Alarm text field + U32 alarmNumber; ///< Alarm number + ALARM_ID_T alarmID; ///< Alarm ID + char field[9000]; ///< Alarm text field }; typedef struct AlarmsManualRecord ALARM_MANUAL_T; Index: MsgDefs.h =================================================================== diff -u -r08e1637a87576d92ddbfa29e91a852cd26451a70 -re887d8a4f81f546eef9ba436814c39bfde995ffc --- MsgDefs.h (.../MsgDefs.h) (revision 08e1637a87576d92ddbfa29e91a852cd26451a70) +++ MsgDefs.h (.../MsgDefs.h) (revision e887d8a4f81f546eef9ba436814c39bfde995ffc) @@ -517,6 +517,7 @@ REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED = 46, ///< DG disinfect has been expired REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE = 47, ///< DG service is due 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 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