Index: AlarmDefs.h =================================================================== diff -u -reed2329e907013eced8e367f39b78a44d34bbe62 -r6239d92af0c24bc2f95033723b9c8c58f0213c64 --- AlarmDefs.h (.../AlarmDefs.h) (revision eed2329e907013eced8e367f39b78a44d34bbe62) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6239d92af0c24bc2f95033723b9c8c58f0213c64) @@ -87,7 +87,7 @@ ALARM_ID_VALVE_CONTROL_FAILURE = 51, ///< FPGA not accepting commanded valve states ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52, ///< Blood pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53, ///< Dialysate inlet pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed - ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 54, ///< Dialysate outlet pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed + ALARM_ID____AVAILABLE___ = 54, ///< This alarm ID is available - currently unused ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55, ///< Blood pump failed motor speed check. Measured vs. commanded ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56, ///< Dialysate inlet pump failed motor speed check. Measured vs. commanded ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57, ///< Dialysate outlet pump failed motor speed check. Measured vs. commanded @@ -182,23 +182,23 @@ /// Enumeration of alarm state flags bit positions in periodic broadcast enum Alarm_State_Flag_Bit_Positions { - ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT = 0, - ALARM_STATE_FLAG_BIT_POS_STOP = 1, - ALARM_STATE_FLAG_BIT_POS_NO_CLEAR = 2, - ALARM_STATE_FLAG_BIT_POS_NO_RESUME = 3, - ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK = 4, - ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT = 5, - ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT = 6, - ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK = 7, - ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE = 8, - ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED = 9, - ALARM_STATE_FLAG_BIT_POS_LAMP_ON = 10, - ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 11, - ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 12, - ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 13, - ALARM_STATE_FLAG_BIT_POS_UNUSED_4 = 14, - ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION = 15, - NUM_OF_ALARM_STATE_FLAG_BIT_POS = 16 + ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT = 0, ///< One or more system faults has been triggered + ALARM_STATE_FLAG_BIT_POS_STOP = 1, ///< Alarm(s) have stopped treatment/activity and placed system in a safe state + ALARM_STATE_FLAG_BIT_POS_NO_CLEAR = 2, ///< One or more active alarms is not recoverable + ALARM_STATE_FLAG_BIT_POS_NO_RESUME = 3, ///< The "resume" user recovery option is disabled + ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK = 4, ///< The "rinseback" user recovery option is disabled + ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT = 5, ///< The "end treatment" user recovery option is disabled + ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT = 6, ///< A new treatment may not be started without cycling power to system + ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK = 7, ///< The "ok" user recovery option is enabled + ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE = 8, ///< One or more active alarms will escalate in time + ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED = 9, ///< Alarms have been temporarily silenced by user + ALARM_STATE_FLAG_BIT_POS_LAMP_ON = 10, ///< Alarm lamp is currently on (for syncing to UI) + ALARM_STATE_FLAG_BIT_POS_UNUSED_1 = 11, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_2 = 12, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_3 = 13, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_UNUSED_4 = 14, ///< Reserved + ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION = 15, ///< The top alarm's condition is still being detected + NUM_OF_ALARM_STATE_FLAG_BIT_POS = 16 ///< The number of alarm state flag bit positions }; typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T; @@ -287,7 +287,7 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_VALVE_CONTROL_FAILURE { ALARM_PRIORITY_HIGH, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK { ALARM_PRIORITY_HIGH, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK - { ALARM_PRIORITY_HIGH, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // *** Available *** { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK