From a40db3104e6d5d8a5d146ad808e5bb1ad6c8cb07 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 17:53:22 +0800
Subject: [PATCH] 20201120
---
HDL_ON/DAL/DriverLayer/Packet.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
similarity index 96%
rename from HDL_ON/DriverLayer/Packet.cs
rename to HDL_ON/DAL/DriverLayer/Packet.cs
index d957a86..bdbd273 100644
--- a/HDL_ON/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -8,7 +8,7 @@
namespace HDL_ON
{
/// <summary>
- /// bus鎺у埗鏁版嵁鍖�
+ /// Udp鏁版嵁鍖�
/// </summary>
public class Packet
{
@@ -56,7 +56,7 @@
try
{
//濡傛灉褰撳墠閫氳鏂瑰紡涓嶆槸鏈湴bus udp鍒欓��鍑�
- if(DriverLayer.Control.ins.communicationMode == DriverLayer.CommunicationMode.local_BusUdp)
+ if(DriverLayer.Control.ins.communicationMode != DriverLayer.CommunicationMode.local_BusUdp)
{
return;
}
@@ -571,6 +571,13 @@
}
}
break;
+ case Command.ReadGatewayACK:
+ var mac = ByteToHex16(receiveBytes[5]) + "." + ByteToHex16(receiveBytes[6]) + "." + ByteToHex16(receiveBytes[7]) + "." + ByteToHex16(receiveBytes[8]) + "." + ByteToHex16(receiveBytes[9]) + "." + ByteToHex16(receiveBytes[10]) + "." + ByteToHex16(receiveBytes[11]) + "." + ByteToHex16(receiveBytes[12]);
+ if (DB_ResidenceData.residenceData.residenceGatewayMAC == mac)
+ {
+ DriverLayer.Control.ins.gatewayOnline = true;
+ }
+ break;
}
}
catch (Exception ex)
@@ -578,6 +585,20 @@
MainPage.Log($"Bus Rev Erorr : {ex.Message}");
}
}
+ /// <summary>
+ /// byte杞�16杩涘埗瀛楃涓�
+ /// </summary>
+ /// <param name="b"></param>
+ /// <returns></returns>
+ string ByteToHex16(byte b)
+ {
+ string s = Convert.ToString(b, 16).ToUpper();
+ if(s.Length<=1)
+ {
+ return "0" +s;
+ }
+ return s;
+ }
/// <summary>
--
Gitblit v1.8.0