From 6cbd0936d3245fd7c433884ac9c1f5448a7cf657 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 13 十二月 2019 13:49:44 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index b0733e1..79b5835 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -54,9 +54,13 @@
/// </summary>
FanControl = 514,
/// <summary>
+ /// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖鎵锛�
+ /// </summary>
+ FanSwing = 514,
+ /// <summary>
/// 闂ㄩ攣鍔熻兘
/// </summary>
- DoorLock = 257,
+ DoorLock = 10,
/// <summary>
/// IAS瀹夐槻鍔熻兘
/// </summary>
@@ -222,6 +226,11 @@
HeatingSetpoint = 18,
/// <summary>
+ /// 褰撳墠鑷姩娓╁害
+ /// </summary>
+ AutoSetpoint = 4096,
+
+ /// <summary>
///鎭掓俯璁惧绫诲瀷
///MinCoolSetpointLimit ~ MaxCoolSetpointLimit
/// </summary>
@@ -243,6 +252,23 @@
/// </summary>
FanModeSequence = 1,
+ /// <summary>
+ /// 杩囪檻缃戞竻娲楁爣蹇�,濡傛灉杩斿洖鍗佽繘鍒躲��42銆戝垯浠ｈ〃闇�瑕佹竻娲楁护缃�
+ /// </summary>
+ FilterCleaningStatus = 4097,
+ /// <summary>
+ /// 绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+ /// </summary>
+ AcModeSupport = 4099,
+ /// <summary>
+ /// 绌鸿皟鎽嗛
+ /// </summary>
+ FanSwing = 4096,
+ /// <summary>
+ /// 杩囪檻缃戞竻娲楁爣蹇�:42
+ /// </summary>
+ CleanStatu = 4097,
+
#endregion
#region 绉佹湁鎸夐敭灞炴��
--
Gitblit v1.8.0