From c8514f302de61b16f5666460ff15d20b615dba8c Mon Sep 17 00:00:00 2001 From: chenzhihao <1798906853@qq.com> Date: Fri, 13 Mar 2026 15:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B8=A9=E6=8E=A7=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E7=BB=84=E5=8C=85=E9=80=BB=E8=BE=91=E4=B8=AD?= =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E6=AF=94=E8=BE=83=E7=89=88=E6=9C=AC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/BLV_Studio/v16/.suo | Bin 721408 -> 729600 bytes BLV_Studio/My Project/AssemblyInfo.vb | 2 +- BLV_Studio/Test/GridTest/TableInteraction.vb | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vs/BLV_Studio/v16/.suo b/.vs/BLV_Studio/v16/.suo index 592b4b594392933266aba7f5133d81d5b14270d7..00b1a8771c51836f6857b64f65b10cd825566540 100644 GIT binary patch delta 7698 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 - + diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index e3812ad..c18434f 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -4303,7 +4303,7 @@ Public Class TableInteraction Dbuf = dic.Item(GetDescriptionOriginal(AddPeripherals.Temproweven.互锁)).Trim.Split("*") ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer =67 Then + If FVer =68 Then Dim btxtr As string Dim bctr As Integer=48 @@ -4325,7 +4325,7 @@ Public Class TableInteraction dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) btxli(5) = bctr ncbuf.Add(btxli) - Else If FVer > 67 Then + Else If FVer > 68 Then Else If checkbuf(1).Equals("1") Then 'Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*") @@ -4394,7 +4394,7 @@ Public Class TableInteraction ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16")) End If - If FVer =67 Then + If FVer =68 Then Dim btxtr As string Dim bctr As Integer=32 @@ -4418,7 +4418,7 @@ Public Class TableInteraction dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr) btxli(5) = bctr ncbuf.Add(btxli) - Else If FVer > 67 Then + Else If FVer > 68 Then Else If checkbuf(1).Equals("1") Then