From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index a5aa9a6..7943391 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -10,6 +10,10 @@
/// </summary>
Basic = 0,
/// <summary>
+ /// 鏌ヨ鐢甸噺
+ /// </summary>
+ Power = 1,
+ /// <summary>
/// 璁惧璇嗗埆鍔熻兘
/// </summary>
Identify = 3,
@@ -54,9 +58,13 @@
/// </summary>
FanControl = 514,
/// <summary>
+ /// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖鎵锛�
+ /// </summary>
+ FanSwing = 514,
+ /// <summary>
/// 闂ㄩ攣鍔熻兘
/// </summary>
- DoorLock = 257,
+ DoorLock = 10,
/// <summary>
/// IAS瀹夐槻鍔熻兘
/// </summary>
@@ -248,6 +256,27 @@
/// </summary>
FanModeSequence = 1,
+ /// <summary>
+ /// 杩囪檻缃戞竻娲楁爣蹇�,濡傛灉杩斿洖鍗佽繘鍒躲��42銆戝垯浠ｈ〃闇�瑕佹竻娲楁护缃�
+ /// </summary>
+ FilterCleaningStatus = 4097,
+ /// <summary>
+ /// 绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+ /// </summary>
+ AcModeSupport = 4099,
+ /// <summary>
+ /// 绌鸿皟鎽嗛
+ /// </summary>
+ FanSwing = 4096,
+ /// <summary>
+ /// 杩囪檻缃戞竻娲楁爣蹇�:42
+ /// </summary>
+ CleanStatu = 4097,
+ /// <summary>
+ /// 鍚敤绌鸿皟鎽嗛妯″紡鐨勭姸鎬�(鎵撳紑 鎴栬�� 鍏抽棴)
+ /// </summary>
+ UseAcSwingFunctionStatu = 4097,
+
#endregion
#region 绉佹湁鎸夐敭灞炴��
@@ -278,6 +307,11 @@
/// 纭欢鐗堟湰
/// </summary>
mgHWversion = 65024,
+
+ /// <summary>
+ /// 闂ㄩ攣鐢甸噺
+ /// </summary>
+ DoorLockPower = 33,
}
/// <summary>
--
Gitblit v1.8.0