From 35c4bc03ee8da50317cd3f33e9f52f0a4259affd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
old mode 100644
new mode 100755
index caeabf2..984a091
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -40,8 +40,9 @@
{
var oidNetId = Convert.ToByte(oid.addresses.Substring(0, 2),16);
var oidDevId = Convert.ToByte(oid.addresses.Substring(2, 2),16);
- sidObj.bus_Data = new BusData();
- sidObj.bus_Data.loopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus = new BusData();
+ //sidObj.bus.LoopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus.loopId = sidObj.sid.Substring(20, 4);
}
FunctionList.List.AddDeviceFunction(sidObj);
}
--
Gitblit v1.8.0