Changed logic for building responses

Removed calls to write empty content if no values are found for responses.

Author: ZacharyWalsh57

SharpAutoId/Properties/AssemblyInfo.cs

@@ -19,7 +19,7 @@
 [assembly: Guid("73552094-035A-4DFB-BEC4-5116EC7993EF")]
 
 // Version information
-[assembly: AssemblyVersion("0.4.4.153")]
-[assembly: AssemblyFileVersion("0.4.4.153")]
+[assembly: AssemblyVersion("0.4.4.156")]
+[assembly: AssemblyFileVersion("0.4.4.156")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

SharpExpressions/Properties/AssemblyInfo.cs

@@ -19,7 +19,7 @@
 [assembly: Guid("73552094-035A-4DFB-BEC4-5116EC7993EF")]
 
 // Version information
-[assembly: AssemblyVersion("0.5.15.392")]
-[assembly: AssemblyFileVersion("0.5.15.392")]
+[assembly: AssemblyVersion("0.5.15.395")]
+[assembly: AssemblyFileVersion("0.5.15.395")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

SharpPipes/Properties/AssemblyInfo.cs

@@ -19,7 +19,7 @@
 [assembly: Guid("73552094-035A-4DFB-BEC4-5116EC7993EF")]
 
 // Version information
-[assembly: AssemblyVersion("0.2.4.48")]
-[assembly: AssemblyFileVersion("0.2.4.48")]
+[assembly: AssemblyVersion("0.2.4.50")]
+[assembly: AssemblyFileVersion("0.2.4.50")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

SharpSimulator/PassThruSimulationPlayer.cs

@@ -683,7 +683,11 @@ private void _processSimulationMessages()
                 }
 
                 // If no message was found for the given input, move onto the next one
-                if (IndexOfMessageFound == -1) continue;
+                if (IndexOfMessageFound == -1 || IndexOfMessageSet == -1) continue;
+
+                // If no responses exist for the given input, move onto the next message
+                var MessagesToSend = this.PairedSimulationMessages[IndexOfMessageSet][IndexOfMessageFound];
+                if (MessagesToSend.MessageResponses.Length == 0) continue;
 
                 // Mark a new channel is needed and build new one for configuration of messages
                 try
@@ -749,8 +753,8 @@ private bool _generateResponseChannel(int IndexOfMessageSet, int IndexOfMessageF
             var ProtocolValue = this.ChannelProtocols[IndexOfMessageSet];
             var FiltersToApply = this.ChannelFilters[IndexOfMessageSet];
 
-            // Find our message contents and pick what filters we're looking to apply
-            var PulledMessages = this.PairedSimulationMessages[IndexOfMessageSet][IndexOfMessageFound]; 
+            // Once we know there's messages for us to send back, we do so now
+            var PulledMessages = this.PairedSimulationMessages[IndexOfMessageSet][IndexOfMessageFound];
             var FilterFlowCtl = PulledMessages.MessageResponses.FirstOrDefault(MsgObj => MsgObj.RxStatus == 0).DataToHexString();
             bool CanMatchFilter = FiltersToApply.Any(FilterObj => string.IsNullOrWhiteSpace(FilterFlowCtl) || FilterFlowCtl.Contains(FilterObj.FilterFlowCtl));
 
@@ -762,7 +766,11 @@ private bool _generateResponseChannel(int IndexOfMessageSet, int IndexOfMessageF
                 if (CanMatchFilter && !FilterFlowCtl.Contains(ChannelFilter.FilterFlowCtl)) continue;
 
                 // Try and set each filter for the channel. Skip duplicate filters
-                try { this.PhysicalChannel.StartMessageFilter(ChannelFilter); }
+                try
+                {
+                    this.PhysicalChannel.StartMessageFilter(ChannelFilter);
+                    this._simPlayingLogger.WriteLog($"Started Filter: {ChannelFilter.FilterMask} | {ChannelFilter.FilterPattern} | {ChannelFilter.FilterFlowCtl}", LogType.ErrorLog);
+                }
                 catch
                 {
                     // Log out what our duplicate/invalid filter was
@@ -783,8 +791,12 @@ private bool _generateResponseChannel(int IndexOfMessageSet, int IndexOfMessageF
         private bool _generateSimulationResponses(int IndexOfMessageSet, int IndexOfMessageFound)
         {
             // Pull out the message set, then find the response messages and send them out
+            this._simPlayingLogger.WriteLog(string.Join("", Enumerable.Repeat("=", 100)));
             var PulledMessages = this.PairedSimulationMessages[IndexOfMessageSet][IndexOfMessageFound];
-            if (!this.ResponsesEnabled)
+
+            // Log message contents out and then log the responses out if we are going to be sending them
+            this._simPlayingLogger.WriteLog($"--> READ MESSAGE [0]: {BitConverter.ToString(PulledMessages.MessageRead.Data)}", LogType.InfoLog);
+            if (!ResponsesEnabled)
             {
                 // Fake a reply output event and disconnect our channel
                 this.SimulationSession.PTDisconnect(0);
@@ -800,6 +812,10 @@ private bool _generateSimulationResponses(int IndexOfMessageSet, int IndexOfMess
 
                 // Attempt to send output events in a task to stop hanging our response operations
                 this.SimMessageReceived(new SimMessageEventArgs(this.SimulationSession, true, PulledMessages.MessageRead, PulledMessages.MessageResponses));
+                for (int RespIndex = 0; RespIndex < PulledMessages.MessageResponses.Length; RespIndex += 1)
+                    this._simPlayingLogger.WriteLog($"   --> SENT MESSAGE [{RespIndex}]: {BitConverter.ToString(PulledMessages.MessageResponses[RespIndex].Data)}");
+
+                // Return passed sending output
                 return true;
             }
             catch (Exception SendResponseException)

SharpSimulator/Properties/AssemblyInfo.cs

@@ -19,7 +19,7 @@
 [assembly: Guid("183F7A6A-E107-4209-8A11-044A08DEAEE4")]
 
 // Version information
-[assembly: AssemblyVersion("0.12.12.320")]
-[assembly: AssemblyFileVersion("0.12.12.320")]
+[assembly: AssemblyVersion("0.12.12.323")]
+[assembly: AssemblyFileVersion("0.12.12.323")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

SharpWrapper/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@
 [assembly: InternalsVisibleTo("SharpWrap2534Tests")]
 
 // Version information
-[assembly: AssemblyVersion("6.2.1.500")]
-[assembly: AssemblyFileVersion("6.2.1.500")]
+[assembly: AssemblyVersion("6.2.1.502")]
+[assembly: AssemblyFileVersion("6.2.1.502")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]