Merge

2 files changed, 6 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.Transport/TransportResponseConfig.cs b/Software/Visual_Studio/Tango.Transport/TransportResponseConfig.cs
index 79940757d..2aa40d6ef 100644
--- a/Software/Visual_Studio/Tango.Transport/TransportResponseConfig.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransportResponseConfig.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
 using Tango.PMR.Common;
+using Tango.PMR.Diagnostics;
 
 namespace Tango.Transport
 {
@@ -12,6 +13,7 @@ namespace Tango.Transport
     {
         public bool Completed { get; set; }
         public ErrorCode? ErrorCode { get; set; }
+        public EventType EventType { get; set; }
         public String ErrorMessage { get; set; }
         public bool ShouldLog { get; set; }
         public bool Immediate { get; set; }
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index 5a56754b9..017f75158 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -977,6 +977,8 @@ namespace Tango.Transport
                 container.ErrorMessage = config.ErrorMessage;
             }
 
+            container.EventCode = (int)config.EventType;
+
             container.Completed = config.Completed;
 
             return SendResponse(container);
@@ -1075,6 +1077,8 @@ namespace Tango.Transport
                 response.Container.ErrorMessage = config.ErrorMessage;
             }
 
+            response.Container.EventCode = (int)config.EventType;
+
             LogManager.Log($"{GetExtendedComponentName()}: Queuing response message: " + typeof(Response).Name, LogCategory.Debug);
 
             if (State != TransportComponentState.Connected)