From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index 0164334..b228052 100644
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -41,11 +41,11 @@
var oidNetId = Convert.ToByte(oid.addresses.Substring(0, 2),16);
var oidDevId = Convert.ToByte(oid.addresses.Substring(2, 2),16);
sidObj.bus = new BusData();
- sidObj.bus.loopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ //sidObj.bus.LoopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus.loopId = sidObj.sid.Substring(20, 4);
}
- FunctionList.List.AddDeviceFunction(sidObj);
+ //FunctionList.List.AddDeviceFunction(sidObj);
}
- //MainPage.GoUserPage();
}
}
--
Gitblit v1.8.0