mh fix for application info messages, evtype return not needed

9f22e06f · Claes Sjofors · aaf2e162 · 9f22e06f · 9f22e06f
Commit 9f22e06f authored Sep 16, 2019 by Claes Sjofors
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

src/exe/rt_emon/src/rt_emon.c src/exe/rt_emon/src/rt_emon.c +2 -4

src/lib/rt/src/rt_rtt_alarm.c src/lib/rt/src/rt_rtt_alarm.c +7 -1

No files found.
--- a/src/exe/rt_emon/src/rt_emon.c
+++ b/src/exe/rt_emon/src/rt_emon.c
@@ -1215,8 +1215,7 @@ static void sendAlarmStatus(sOutunit* op)
        if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow))
          break;
        if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow
-            && (!(ep->msg.info.EventFlags & mh_mEventFlags_Ack)
-                   || !(ep->msg.info.EventFlags & mh_mEventFlags_Return)))
+            && !(ep->msg.info.EventFlags & mh_mEventFlags_Ack))
          break;
      }

@@ -1263,8 +1262,7 @@ static void sendAlarmStatus(sOutunit* op)
        if (ep && !(ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow))
          break;
        if (ep && ep->msg.info.EventFlags & mh_mEventFlags_InfoWindow
-            && (!(ep->msg.info.EventFlags & mh_mEventFlags_Ack)
-                   || !(ep->msg.info.EventFlags & mh_mEventFlags_Return)))
+            && !(ep->msg.info.EventFlags & mh_mEventFlags_Ack))
          break;
      }


--- a/src/lib/rt/src/rt_rtt_alarm.c
+++ b/src/lib/rt/src/rt_rtt_alarm.c
@@ -191,7 +191,13 @@ int rtt_alarm_send(char* alarm_text, int alarm_prio)
    break;
  case 'I':
    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;
  default:
    mh_msg.EventPrio = mh_eEventPrio_A;