Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rf884f35638cad1f29601c1418e942185c5f1489b -r89e21ce50fba7e91573780b0f57b6378e3cad84a --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision f884f35638cad1f29601c1418e942185c5f1489b) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 89e21ce50fba7e91573780b0f57b6378e3cad84a) @@ -338,6 +338,9 @@ data.almData1 = alarmData1.data.uInt.data; data.almDataType2 = (U32)alarmData2.dataType; data.almData2 = alarmData2.data.uInt.data; + data.almPriority = ALARM_TABLE[ alarm ].alarmPriority; + data.almRank = ALARM_TABLE[ alarm ].alarmSubRank; + data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly; broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) ); // Send information for UI to log to treatment log Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -rf884f35638cad1f29601c1418e942185c5f1489b -r89e21ce50fba7e91573780b0f57b6378e3cad84a --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision f884f35638cad1f29601c1418e942185c5f1489b) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 89e21ce50fba7e91573780b0f57b6378e3cad84a) @@ -74,7 +74,7 @@ BOOL noDialRecirc; ///< No dialysate re-circulation allowed at this time BOOL ok; ///< Display OK button instead of other options BOOL noMinimize; ///< Prevent user from minimizing the alarm window - BOOL lampOn; ///< The alarm lamp is on + BOOL lampOn; ///< The alarm lamp is on } COMP_ALARM_STATUS_T; /// Record structure for unsigned integer alarm data. @@ -135,6 +135,9 @@ U32 almData1; ///< Supporting data #1 U32 almDataType2; ///< Supporting data type #2 U32 almData2; ///< Supporting data #2 + U32 almPriority; ///< Alarm priority + U32 almRank; ///< Alarm rank + BOOL almClrTopOnly; ///< Alarm clear (when on top) should only clear top alarm } ALARM_TRIGGERED_PAYLOAD_T; #pragma pack(pop) Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rf884f35638cad1f29601c1418e942185c5f1489b -r89e21ce50fba7e91573780b0f57b6378e3cad84a --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f884f35638cad1f29601c1418e942185c5f1489b) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 89e21ce50fba7e91573780b0f57b6378e3cad84a) @@ -1810,6 +1810,7 @@ payload.alarmsFlags |= ( almStatus.alarmsToEscalate ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 ); payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 ); payload.alarmsFlags |= ( almStatus.lampOn ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON) : 0 ); + payload.alarmsFlags |= ( almStatus.noDialRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC) : 0 ); payload.alarmsFlags |= ( almStatus.noMinimize ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE) : 0 ); payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION) : 0 );