From a46cd0adb5af29e8a9cf47c219475acaedfcf839 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index ce3a5f1..f506767 100644
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -42,9 +42,7 @@
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.SubnetID = oidNetId;
- sidObj.bus_Data.DeviceID = oidDevId;
- sidObj.bus_Data.LoopID = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus_Data.loopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
}
DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
}
--
Gitblit v1.8.0