Index: AlarmDefs.h =================================================================== diff -u -r68a17e52574cb3864d68d683b0b549fe79cd1178 -r40226fe0fb449e93ccbd1fbb3b50dd17d15a7c71 --- AlarmDefs.h (.../AlarmDefs.h) (revision 68a17e52574cb3864d68d683b0b549fe79cd1178) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 40226fe0fb449e93ccbd1fbb3b50dd17d15a7c71) @@ -20,7 +20,7 @@ // ********** public definitions ********** /// Enumeration of alarm IDs. -typedef enum Alarm_List +enum Alarm_List { ALARM_ID_NO_ALARM = 0, ///< Indication for when no alarms is a possible situation. ALARM_ID_SOFTWARE_FAULT = 1, ///< Software fault. Software found itself in an unexpected state. @@ -69,16 +69,24 @@ ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 44, ///< Calibration record CRC failure. ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45, ///< HW usage data (treatment time in HD and total consumed water in DG) failure. AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46, ///< Last disinfection date CRC error + ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47, ///< Pressure at outlet of RO pump is out of range. + ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE = 48, ///< DG temperature sensors ADC read out of range + ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = 49, ///< DG temperature sensors values are inconsistent with respect to each other + ALARM_ID_HD_COMM_TIMEOUT = 50, ///< HD communication timeout. NUM_OF_ALARM_IDS ///< Total # of alarms. -} ALARM_ID_T; +}; +/// Type for alarm list enumeration. +typedef enum Alarm_List ALARM_ID_T; -typedef enum Alarm_Priorities +enum Alarm_Priorities { ALARM_PRIORITY_NONE = 0, ///< Indicates not an alarm or no alarms active at this time. ALARM_PRIORITY_LOW = 1, ///< Low priority alarm. ALARM_PRIORITY_MEDIUM = 2, ///< Medium priority alarm. ALARM_PRIORITY_HIGH = 3, ///< High priority alarm. NUM_OF_ALARM_PRIORITIES ///< Total # of alarm priorities. -} ALARM_PRIORITY_T; +}; +/// Type for alarm priorities enumeration. +typedef enum Alarm_Priorities ALARM_PRIORITY_T; #endif