Index: AlarmDefs.h =================================================================== diff -u -ra709d8e2e9c5195eeb7404d1afaa3701a0940248 -r3a8be92b72adc11e5b5045bf8921446d2d5e8e8a --- AlarmDefs.h (.../AlarmDefs.h) (revision a709d8e2e9c5195eeb7404d1afaa3701a0940248) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3a8be92b72adc11e5b5045bf8921446d2d5e8e8a) @@ -174,6 +174,7 @@ ALARM_ID_DIALYSATE_TEMPERATRUE_TOO_LOW = 136, ///< HD dialysate temperature too low alarm ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 137, ///< HD pre-treatment mode dry self-tests failure ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138, ///< HD pre-treatment mode wet self-tests failure + ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 139, ///< DG flow meter check failure alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -418,6 +419,7 @@ { ALARM_PRIORITY_HIGH, 29, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATRUE_TOO_LOW { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_FLOW_METER_CHECK_FAILURE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: DGDefs.h =================================================================== diff -u -rd3f89a836ece4a21be2b9abfb244adfc4290357b -r3a8be92b72adc11e5b5045bf8921446d2d5e8e8a --- DGDefs.h (.../DGDefs.h) (revision d3f89a836ece4a21be2b9abfb244adfc4290357b) +++ DGDefs.h (.../DGDefs.h) (revision 3a8be92b72adc11e5b5045bf8921446d2d5e8e8a) @@ -276,7 +276,47 @@ NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration + +/**@}*/ + +/** + * @addtogroup Reservoirs + * @{ + */ + +/// Enumeration of DG reservoirs. +typedef enum DG_Reservoirs +{ + DG_RESERVOIR_1 = 0, ///< Reservoir number 1 + DG_RESERVOIR_2, ///< Reservoir number 2 + NUM_OF_DG_RESERVOIRS ///< Number of reservoirs +} DG_RESERVOIR_ID_T; + +/// Enumeration of DG valve settings. +typedef enum DG_Valve_Setting +{ + DG_VALVE_SETTING_R1_TO_R2 = 0, ///< Valve setting for displacement from reservoir 1 to reservoir 2 + DG_VALVE_SETTING_R2_TO_R1, ///< Valve setting for displacement from reservoir 2 to reservoir 1 + NUM_OF_DG_VALVE_SETTTINGS ///< Number of valve settings +} DG_VALVE_SETTING_ID_T; + +/**@}*/ + +/** + * @addtogroup LoadCells + * @{ + */ + +/// Enumeration of DG load cell sensors. +typedef enum Load_Cells +{ + LOAD_CELL_RESERVOIR_1_PRIMARY = 0, ///< Primary load cell for reservoir 1. + LOAD_CELL_RESERVOIR_1_BACKUP, ///< Backup load cell for reservoir 1. + LOAD_CELL_RESERVOIR_2_PRIMARY, ///< Primary load cell for reservoir 2. + LOAD_CELL_RESERVOIR_2_BACKUP, ///< Backup load cell for reservoir 2. + NUM_OF_LOAD_CELLS ///< Number of load cell sensors. +} LOAD_CELL_ID_T; + +/**@}*/ -/**@}*/ - #endif