From eb5a57942bae8eb57fd7fb61124c247bebb67e8e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 10:18:28 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
Home0618/Shared/Phone/ZigBee/Device/DeviceType.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/Home0618/Shared/Phone/ZigBee/Device/DeviceType.cs b/Home0618/Shared/Phone/ZigBee/Device/DeviceType.cs
index 4ab9cd6..be1ae91 100644
--- a/Home0618/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/Home0618/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -34,7 +34,13 @@
/// <para>璋冨厜鐏細鏀寔浜害</para>
/// <para>璋冨厜璁惧</para>
/// </summary>
- DimmableLight = 257,
+ DimmableLight = 257,
+ /// <summary>
+ /// 璁惧ID涓�258鐨勮澶�
+ /// <para>鑹叉俯鐏�</para>
+ /// <para>瀹氫箟瀵硅薄锛欳olorTemperatureLight</para>
+ /// </summary>
+ ColorTemperatureLight = 258,
/// <summary>
/// 棰滆壊璋冨厜鐏紑鍏�
/// <para>璁惧ID涓�2</para>
@@ -68,7 +74,13 @@
/// <para>璁惧ID涓�1026鐨勮澶�</para>
/// <para>瀹氫箟瀵硅薄锛欼ASZone</para>
/// </summary>
- IASZone = 1026,
+ IASZone = 1026,
+ /// <summary>
+ /// 铚傞福鍣�
+ /// <para>璁惧ID涓�1027鐨勮澶�</para>
+ /// <para>瀹氫箟瀵硅薄锛欱uzzer</para>
+ /// </summary>
+ Buzzer = 1027,
/// <summary>
/// 绌烘皵寮�鍏�
/// </summary>
@@ -97,7 +109,7 @@
/// <summary>
/// <para>鏂伴婀垮害浼犳劅鍣�</para>
/// <para>璁惧ID涓�53760</para>
- /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
+ /// <para>瀹氫箟瀵硅薄锛欻umiditySensor</para>
/// </summary>
FreshAirHumiditySensor = 0xD200,
/// 杞崲鍣�
@@ -125,9 +137,13 @@
public enum DeviceFunctionType
{
/// <summary>
- /// 娌℃湁鎸囧畾涓轰粈涔堢被鍨�
+ /// 杩樻病鏈夋寚瀹氫负浠�涔堢被鍨�
/// </summary>
- A鏈畾涔� = 0,
+ A鏈畾涔� = -1,
+ /// <summary>
+ /// 鎵嬪姩鎸囧畾瀹冧负涓嶆寚鍚戜换浣曠被鍨�
+ /// </summary>
+ A涓嶆寚瀹� = 0,
/// <summary>
/// 寮�鍏�
/// </summary>
--
Gitblit v1.8.0