Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 13 insertions, 20 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index aa19c78dc..86f929ee5 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -473,26 +473,9 @@ void SendEventNotifications(void)
 
     if (AlarmHandlingActive == false)
         return;
- //   if (AlarmHandlingToken[0] == 0)
- //       return;
-/*
- typedef struct
-{
-    uint16_t Frequency;  //1/10/100/1000
-    AlarmSource AlarmSource;
-    uint16_t DeviceId;
-    uint32_t AlarmValue;
-    bool AlarmDirection;
-    DebugLogCategory Severity;
-    uint16_t Predecessor;
-    uint8_t DebounceValue;
-    int8_t DebounceCounter;
-    bool Status;
-    EventType EventType;
-}AlarmHandlingItem;
-AlarmHandlingItem  AlarmItem[MAX_SYSTEM_ALARMS]={
+    if (AlarmHandlingToken[0] == 0)
+        return;
 
- */
     response.n_events = 0;
 
     for (i = 0;i<MAX_SYSTEM_ALARMS;i++)
@@ -501,7 +484,7 @@ AlarmHandlingItem  AlarmItem[MAX_SYSTEM_ALARMS]={
         {
             response.n_events++;
             AlarmItem[i].EventPtr = malloc (sizeof(Event));
-            AlarmItem[i].EventPtr = EVENT__INIT;
+            event__init(AlarmItem[i].EventPtr);
             if (AlarmItem[i].EventPtr)
             {
                 AlarmItem[i].EventPtr->has_type = true;
@@ -524,11 +507,21 @@ AlarmHandlingItem  AlarmItem[MAX_SYSTEM_ALARMS]={
 
     uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    free(responseContainer.data.data);
 
     if (SendChars(container_buffer, container_size) == false) //comm tx mailbox full
     {
         AlarmHandlingToken[0] = 0;
     }
+    for (i = 0;i<MAX_SYSTEM_ALARMS;i++)
+    {
+        if (AlarmItem[i].EventPtr)
+        {
+            free(AlarmItem[i].EventPtr);
+        }
+    }
+    free (response.events)
+
 }
 
 uint32_t StartEventsNotificationRequestFunc(MessageContainer* requestContainer)