Commit 7a32c4ea authored by Claes Sjofors's avatar Claes Sjofors Committed by Claes Sjöfors

mh fix for application info messages, evtype return not needed

parent b914c1f6
...@@ -1215,8 +1215,7 @@ static void sendAlarmStatus(sOutunit* op) ...@@ -1215,8 +1215,7 @@ static void sendAlarmStatus(sOutunit* op)
if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow)) if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow))
break; break;
if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow
&& (!(ep->msg.info.EventFlags & mh_mEventFlags_Ack) && !(ep->msg.info.EventFlags & mh_mEventFlags_Ack))
|| !(ep->msg.info.EventFlags & mh_mEventFlags_Return)))
break; break;
} }
...@@ -1263,8 +1262,7 @@ static void sendAlarmStatus(sOutunit* op) ...@@ -1263,8 +1262,7 @@ static void sendAlarmStatus(sOutunit* op)
if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow)) if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow))
break; break;
if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow
&& (!(ep->msg.info.EventFlags & mh_mEventFlags_Ack) && !(ep->msg.info.EventFlags & mh_mEventFlags_Ack))
|| !(ep->msg.info.EventFlags & mh_mEventFlags_Return)))
break; break;
} }
......
...@@ -191,7 +191,13 @@ int rtt_alarm_send(char* alarm_text, int alarm_prio) ...@@ -191,7 +191,13 @@ int rtt_alarm_send(char* alarm_text, int alarm_prio)
break; break;
case 'I': case 'I':
mh_msg.EventType = mh_eEvent_Info; mh_msg.EventType = mh_eEvent_Info;
mh_msg.EventFlags = mh_mEventFlags_InfoWindow; mh_msg.EventFlags |= mh_mEventFlags_InfoWindow;
mh_msg.EventFlags |= mh_mEventFlags_Ack;
break;
case 'S':
mh_msg.EventType = mh_eEvent_InfoSuccess;
mh_msg.EventFlags |= mh_mEventFlags_InfoWindow;
mh_msg.EventFlags |= mh_mEventFlags_Ack;
break; break;
default: default:
mh_msg.EventPrio = mh_eEventPrio_A; mh_msg.EventPrio = mh_eEventPrio_A;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment