Index: AlarmDefs.h =================================================================== diff -u -r032f4e864e432bcf5e454a3a2021bee6da9fad1c -ra16e6de7d4a06b20851472e1dbdc20790bd1b38c --- AlarmDefs.h (.../AlarmDefs.h) (revision 032f4e864e432bcf5e454a3a2021bee6da9fad1c) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a16e6de7d4a06b20851472e1dbdc20790bd1b38c) @@ -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. @@ -73,15 +73,19 @@ 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 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 Index: MsgDefs.h =================================================================== diff -u -r9401af3edc8505f0936961a664a0e768811a0f43 -ra16e6de7d4a06b20851472e1dbdc20790bd1b38c --- MsgDefs.h (.../MsgDefs.h) (revision 9401af3edc8505f0936961a664a0e768811a0f43) +++ MsgDefs.h (.../MsgDefs.h) (revision a16e6de7d4a06b20851472e1dbdc20790bd1b38c) @@ -20,7 +20,7 @@ // ********** public definitions ********** /// Enumeration of system message IDs. -typedef enum Msg_IDs +enum Msg_IDs { // normal CAN messages MSG_ID_UNUSED = 0, ///< Zero is an undefined (un-used) message ID). MSG_ID_OFF_BUTTON_PRESS = 1, ///< HD/UI off button interactions. @@ -120,11 +120,14 @@ MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request. MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE = 0xA00B, ///< Drain pump set pt. override request. MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request. + MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE = 0xA00D, ///< Load cell data broadcast interval override request. END_OF_MSG_IDS ///< # of system message IDs. -} MSG_ID_T; +}; +/// Type for message IDs enumeration. +typedef enum Msg_IDs MSG_ID_T; -/// Settings change rejection reason codes. -typedef enum Request_Reject_Reasons +/// Enumeration of settings change rejection reason codes. +enum Request_Reject_Reasons { REQUEST_REJECT_REASON_NONE = 0, ///< Used when there is no rejection. REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE, ///< Request is not allowed in the current operating mode. @@ -140,6 +143,8 @@ REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE, ///< Ultrafiltration volume is out of range. REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE, ///< Ultrafiltration rate is out of range. NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes. -} REQUEST_REJECT_REASON_CODE_T; +}; +/// Type for settings change rejection reason codes enumeration. +typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; #endif