Merge pull request #17 from luca-domenichini/develop

Fix for AggregatingConnectorEventQueue
luca-domenichini · Jan 11, 2024 · 607222b · 607222b
2 parents c6d46b2 + 1b61e81
commit 607222b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/dotnet-prerelease.yml b/.github/workflows/dotnet-prerelease.yml
@@ -2,11 +2,12 @@ name: .NET Prerelease
 
 on:
   push:
-    branches: [ "prerelease" ]
+    tags:
+    - '[0-9]+\.[0-9]+\.[0-9]+\-beta'
 
 env:
   VERSION_MAJOR: 0
-  VERSION_MINOR: 4
+  VERSION_MINOR: 5
   VERSION_SUFFIX: "-beta"
 
 jobs:

diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -2,11 +2,12 @@ name: .NET Release
 
 on:
   push:
-    branches: [ "release" ]
+    tags:
+    - '[0-9]+\.[0-9]+\.[0-9]+'
 
 env:
   VERSION_MAJOR: 0
-  VERSION_MINOR: 4
+  VERSION_MINOR: 5
   VERSION_SUFFIX: ""
 
 jobs:

diff --git a/Core/SmartIOT.Connector.Core/Connector/AggregatingConnectorEventQueue.cs b/Core/SmartIOT.Connector.Core/Connector/AggregatingConnectorEventQueue.cs
@@ -1,4 +1,5 @@
-using SmartIOT.Connector.Core.Events;
+using ProtoBuf;
+using SmartIOT.Connector.Core.Events;
 
 namespace SmartIOT.Connector.Core.Connector;
 
@@ -33,7 +34,7 @@ public class AggregatingConnectorEventQueue : AggregatingQueue<CompositeConnecto
 
         if (e1.Tag == e2.Tag)
         {
-            if (e1.Data != null && e2.Data != null)
+            if (e1.Data != null && e2.Data != null && e1.Data.Length > 0 && e2.Data.Length > 0)
             {
                 int startOffset = Math.Min(e1.StartOffset, e2.StartOffset);
                 int endOffset = Math.Max(e1.StartOffset + e1.Data.Length, e2.StartOffset + e2.Data.Length);
@@ -67,7 +68,7 @@ public class AggregatingConnectorEventQueue : AggregatingQueue<CompositeConnecto
         var e1 = item1.TagScheduleEvent;
         var e2 = item2.TagScheduleEvent;
 
-        if (e1.Tag == e2.Tag && e1.Data != null && e2.Data != null)
+        if (e1.Tag == e2.Tag && e1.Data != null && e2.Data != null && e1.Data.Length > 0 && e2.Data.Length > 0)
         {
             int startOffset = Math.Min(e1.StartOffset, e2.StartOffset);
             int endOffset = Math.Max(e1.StartOffset + e1.Data.Length, e2.StartOffset + e2.Data.Length);

diff --git a/Core/SmartIOT.Connector.Core/Events/TagScheduleEvent.cs b/Core/SmartIOT.Connector.Core/Events/TagScheduleEvent.cs
@@ -39,7 +39,7 @@ public static TagScheduleEvent BuildTagData(Device device, Tag tag, int startOff
 
     public static TagScheduleEvent BuildEmptyTagData(Device device, Tag tag, bool isErrorNumberChanged)
     {
-        return new TagScheduleEvent(device, tag, -1, Array.Empty<byte>(), isErrorNumberChanged);
+        return new TagScheduleEvent(device, tag, tag.ByteOffset, Array.Empty<byte>(), isErrorNumberChanged);
     }
 
     public static TagScheduleEvent BuildTagStatus(Device device, Tag tag, int errorNumber, string description, bool isErrorNumberChanged)