Index: AlarmDefs.h =================================================================== diff -u -r45907574a0110204746643f627960946ee7e06b6 -rbbbcc2db1a02f36e1675c0078c3fbdff2f076d69 --- AlarmDefs.h (.../AlarmDefs.h) (revision 45907574a0110204746643f627960946ee7e06b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision bbbcc2db1a02f36e1675c0078c3fbdff2f076d69) @@ -321,6 +321,30 @@ /**@}*/ +/// Alarm properties request payload for CAN broadcast +struct AlarmTableRequestPayload +{ + U08 alarmPriority; ///< Priority of alarm + U16 alarmSubRank; ///< Alarm's rank within it's priority + U08 alarmSource; ///< Alarm's sub system source + U08 alarmIsFault; ///< Alarm is a system fault? + U08 alarmIsDDFault; ///< Alarm is a fault for DD? + U08 alarmStops; ///< Alarm activation should cause a controlled stop + U08 alarmConditionClearImmed; ///< Alarm condition is cleared immediately (does not persist after alarm triggered) + U08 alarmNoClear; ///< Alarm cannot be cleared (unrecoverable)? + U08 alarmNoResume; ///< Alarm prevents treatment resume + U08 alarmNoRinseback; ///< Alarm prevents rinseback + U08 alarmNoEndTreatment; ///< Alarm prevents ending treatment + U08 alarmBlockRinseback; ///< Alarm should not trigger while in rinseback states + U08 alarmBlockEndTx; ///< Alarm should not trigger while in post-treatment mode + U08 alarmNoBloodRecirc; ///< Alarm prevents blood re-circulation + U08 alarmNoDialysateRecirc; ///< Alarm prevents dialysate re-circulation + U08 alarmAutoResume; ///< Alarm should resume automatically once the condition is cleared + U08 alarmClearOnly; ///< Clear only this alarm on user acknowledgment + U08 alarmTreatmentLog; ///< Log alarm to treatment log if active during treatment + U16 alarmID; ///< Alarm ID +}; +typedef struct AlarmTableRequestPayload ALARM_PROP_T; #if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__) @@ -354,6 +378,8 @@ }; typedef struct AlarmsStateRecord ALARM_T; + + /// Record defining the ranking of each individual alarm. struct AlarmsRankRecord { @@ -362,6 +388,7 @@ }; typedef struct AlarmsRankRecord ALARM_RANK_T; + #endif #ifdef __ALARM_MGMT_C__ Index: MsgDefs.h =================================================================== diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -rbbbcc2db1a02f36e1675c0078c3fbdff2f076d69 --- MsgDefs.h (.../MsgDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3) +++ MsgDefs.h (.../MsgDefs.h) (revision bbbcc2db1a02f36e1675c0078c3fbdff2f076d69) @@ -302,6 +302,8 @@ MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058, ///< TD syringe pump ADC read counter override request MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059, ///< TD heparin bolus target rate override request MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060, ///< TD set syringe pump force sensor DAC calibration request + MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061, ///< TD send alarm table properties request + MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062, ///< TD send alarm table properties response to Dialin MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in