From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index 9256d23..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,
@@ -53,6 +57,10 @@
/// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖锛�
/// </summary>
FanControl = 514,
+ /// <summary>
+ /// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖鎵锛�
+ /// </summary>
+ FanSwing = 514,
/// <summary>
/// 闂ㄩ攣鍔熻兘
/// </summary>
@@ -251,7 +259,23 @@
/// <summary>
/// 杩囪檻缃戞竻娲楁爣蹇�,濡傛灉杩斿洖鍗佽繘鍒躲��42銆戝垯浠ｈ〃闇�瑕佹竻娲楁护缃�
/// </summary>
- FilterCleaningStatus = 4097,
+ FilterCleaningStatus = 4097,
+ /// <summary>
+ /// 绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+ /// </summary>
+ AcModeSupport = 4099,
+ /// <summary>
+ /// 绌鸿皟鎽嗛
+ /// </summary>
+ FanSwing = 4096,
+ /// <summary>
+ /// 杩囪檻缃戞竻娲楁爣蹇�:42
+ /// </summary>
+ CleanStatu = 4097,
+ /// <summary>
+ /// 鍚敤绌鸿皟鎽嗛妯″紡鐨勭姸鎬�(鎵撳紑 鎴栬�� 鍏抽棴)
+ /// </summary>
+ UseAcSwingFunctionStatu = 4097,
#endregion
@@ -283,6 +307,11 @@
/// 纭欢鐗堟湰
/// </summary>
mgHWversion = 65024,
+
+ /// <summary>
+ /// 闂ㄩ攣鐢甸噺
+ /// </summary>
+ DoorLockPower = 33,
}
/// <summary>
--
Gitblit v1.8.0