修改不同类型点位相同偏移量的场景下连续点位读取的问题

NewLifeX · Nov 26, 2023 · 768ce62 · 768ce62
1 parent 7c3b61b
commit 768ce62
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/NewLife.Modbus/Drivers/ModbusDriver.cs b/NewLife.Modbus/Drivers/ModbusDriver.cs
@@ -145,6 +145,8 @@ public override IDictionary<String, Object> Read(INode node, IPoint[] points)
                 try
                 {
                     seg.Data = Modbus.Read(seg.ReadCode, n.Host, (UInt16)seg.Address, (UInt16)seg.Count)?.ReadBytes();
+
+                    var x = seg.Data.Join(" ", e => e.ToHex());
                 }
                 catch (Exception ex)
                 {
@@ -242,8 +244,8 @@ internal IDictionary<String, Object> Dispatch(IPoint[] points, IList<Segment> se
             {
                 var count = GetCount(point);
 
-                // 找到片段
-                var seg = segments.FirstOrDefault(e => e.Address <= maddr.Address && maddr.Address + count <= e.Address + e.Count);
+                // 找到片段 需要补充类型过滤参数避免不同类型相同地址取值错误问题
+                var seg = segments.FirstOrDefault(e => e.Address <= maddr.Address && maddr.Address + count <= e.Address + e.Count && e.ReadCode == maddr.Range.ReadCode);
                 if (seg != null && seg.Data != null)
                 {
                     var code = seg.ReadCode;