From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index b0733e1..0ff39e6 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -56,7 +56,7 @@
/// <summary>
/// 闂ㄩ攣鍔熻兘
/// </summary>
- DoorLock = 257,
+ DoorLock = 10,
/// <summary>
/// IAS瀹夐槻鍔熻兘
/// </summary>
@@ -222,6 +222,11 @@
HeatingSetpoint = 18,
/// <summary>
+ /// 褰撳墠鑷姩娓╁害
+ /// </summary>
+ AutoSetpoint = 4096,
+
+ /// <summary>
///鎭掓俯璁惧绫诲瀷
///MinCoolSetpointLimit ~ MaxCoolSetpointLimit
/// </summary>
--
Gitblit v1.8.0