From 4f6a56bf6ee2e70125e556453d903b7e2f0a1589 Mon Sep 17 00:00:00 2001
From: chenzhihao <1798906853@qq.com>
Date: Tue, 10 Mar 2026 16:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=AF=94=E8=BE=83=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BLV_Studio/FrmMain.vb                        | 16 ++++++++--------
 BLV_Studio/Test/GridTest/TableInteraction.vb |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BLV_Studio/FrmMain.vb b/BLV_Studio/FrmMain.vb
index 3b28d36..36609ef 100644
--- a/BLV_Studio/FrmMain.vb
+++ b/BLV_Studio/FrmMain.vb
@@ -5168,17 +5168,16 @@ Public Class FrmMain
         If TrNode.Level > 1 Then
             TrNode = TrNode.Parent
         End If
-        Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.Text ' TrNode.NextVisibleNode.NextNode.Text
+        Dim FirmwareVer As String = TrNode.FirstNode.Text ' TrNode.NextVisibleNode.NextNode.Text
         Dim FVer As Integer = 0
         If Not String.IsNullOrEmpty(FirmwareVer) Then
             Dim Firbuf As String() = FirmwareVer.Split("_")
-            If Firbuf.Length > 3 Then
+            If Firbuf.Length > 1 Then
                 '将Firbuf(3)十六进制字符串转换为十进制
-
-
-                FVer = Convert.ToInt32(Firbuf(3), 16)
+                FVer = Convert.ToInt32(Firbuf(0))
             End If
         End If
+
         UploadDeviceList(FVer)
     End Sub
 
@@ -5282,12 +5281,13 @@ Public Class FrmMain
         If TrNode.Level > 1 Then
             TrNode = TrNode.Parent
         End If
-        Dim FirmwareVer As String = TrNode.FirstNode.NextNode.NextNode.Text ' TrNode.NextVisibleNode.NextNode.Text
+        Dim FirmwareVer As String = TrNode.FirstNode.Text ' TrNode.NextVisibleNode.NextNode.Text
         Dim FVer As Integer = 0
         If Not String.IsNullOrEmpty(FirmwareVer) Then
             Dim Firbuf As String() = FirmwareVer.Split("_")
-            If Firbuf.Length > 3 Then
-                FVer = Convert.ToInt32(Firbuf(3), 16)
+            If Firbuf.Length > 1 Then
+                '将Firbuf(3)十六进制字符串转换为十进制
+                FVer = Convert.ToInt32(Firbuf(0))
             End If
         End If
         UploadDeviceList1(FVer)
diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb
index 20c3b8d..261dfdf 100644
--- a/BLV_Studio/Test/GridTest/TableInteraction.vb
+++ b/BLV_Studio/Test/GridTest/TableInteraction.vb
@@ -4265,7 +4265,7 @@ Public Class TableInteraction
                         Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
                         ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
                     End If
-                    If FVer >43 Then 
+                    If FVer >67 Then 
                        
                         Dim btxtr As string
                         Dim bctr As Integer=32
@@ -4348,7 +4348,7 @@ Public Class TableInteraction
                         ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
 
                     End If
-                        If FVer >43 Then 
+                        If FVer >67 Then 
                        
                         Dim btxtr As string
                         Dim bctr As Integer=32