From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs | 83 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index dc115d2..f766157 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -42,17 +42,17 @@
/// </summary>
ColorTemperatureLight = 258,
/// <summary>
- /// 棰滆壊璋冨厜鐏紑鍏�
- /// <para>璁惧ID涓�261</para>
- /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
- /// </summary>
- ColorDimmerSwitch = 261,
- /// <summary>
/// 璋冨厜鍣ㄦ帶鍒跺櫒
/// <para>璁惧ID涓�260</para>
/// <para>瀹氫箟瀵硅薄 DimmerSwitch</para>
/// </summary>
DimmerSwitch = 260,
+ /// <summary>
+ /// 棰滆壊璋冨厜鐏紑鍏�
+ /// <para>璁惧ID涓�261</para>
+ /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
+ /// </summary>
+ ColorDimmerSwitch = 261,
/// <summary>
/// 绐楀笜璁惧ID
/// <para>Rollershade:鍗峰笜</para>
@@ -77,6 +77,18 @@
/// </summary>
Thermostat = 769,
/// <summary>
+ /// <para>娓╂箍搴︿紶鎰熷櫒</para>
+ /// <para>璁惧ID涓�770</para>
+ /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
+ /// </summary>
+ TemperatureSensor = 770,
+ /// <summary>
+ /// <para>PM2.5浼犳劅鍣�</para>
+ /// <para>璁惧ID涓�777</para>
+ /// <para>瀹氫箟瀵硅薄锛歅MSensor</para>
+ /// </summary>
+ PMSensor = 777,
+ /// <summary>
/// 瀹夐槻璁惧
/// <para>璁惧ID涓�1026鐨勮澶�</para>
/// <para>瀹氫箟瀵硅薄锛欼ASZone</para>
@@ -89,14 +101,6 @@
/// </summary>
Buzzer = 1027,
/// <summary>
- /// 绌烘皵寮�鍏�
- /// </summary>
- AirSwitch = 53249,
- /// <summary>
- /// 涓户鍣�
- /// </summary>
- Repeater = 53250,
- /// <summary>
/// 鎺у埗婧愯澶�
/// <para>璁惧ID涓�0</para>
/// <para>瀹氫箟瀵硅薄锛歅anel</para>
@@ -108,46 +112,39 @@
/// <para>瀹氫箟瀵硅薄锛歅anel</para>
/// </summary>
OtaDevice = 49153,
+ /// <summary>
+ /// 绌烘皵寮�鍏�
+ /// </summary>
+ AirSwitch = 53249,
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ Repeater = 53250,
+ /// 杞崲鍣�
+ /// <para>璁惧ID涓�53251</para>
+ /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
+ /// </summary>
+ Transverter = 0xD003,
+ /// <summary>
+ /// <para>鏅捐。鏋�</para>
+ /// <para>璁惧ID涓�0xD004 </para>
+ /// <para>瀹氫箟瀵硅薄锛欰irer</para>
+ /// </summary>
+ Airer = 0xD004,
+
/// 鏂伴
/// <para>璁惧ID涓�53504</para>
/// <para>瀹氫箟瀵硅薄锛欶reshAirAC</para>
/// </summary>
FreshAir = 0xD100,
+
/// <summary>
/// <para>鏂伴婀垮害浼犳劅鍣�</para>
/// <para>璁惧ID涓�53760</para>
/// <para>瀹氫箟瀵硅薄锛欻umiditySensor</para>
/// </summary>
FreshAirHumiditySensor = 0xD200,
- /// 杞崲鍣�
- /// <para>璁惧ID涓�53251</para>
- /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
- /// </summary>
- Transverter = 0xD003,
- /// <summary>
- /// <para>娓╂箍搴︿紶鎰熷櫒</para>
- /// <para>璁惧ID涓�770</para>
- /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
- /// </summary>
- TemperatureSensor = 770,
- /// <summary>
- /// <para>PM2.5浼犳劅鍣�</para>
- /// <para>璁惧ID涓�777</para>
- /// <para>瀹氫箟瀵硅薄锛歅MSensor</para>
- /// </summary>
- PMSensor = 777,
- /// <summary>
- /// <para>鏅捐。鏋�</para>
- /// <para>璁惧ID涓�0xD004</para>
- /// <para>瀹氫箟瀵硅薄锛欰irer</para>
- /// </summary>
- Airer = 53252,
- /// <summary>
- /// <para>绌烘皵璐ㄩ噺浼犳劅鍣�</para>
- /// <para>璁惧ID涓�0x0302</para>
- /// <para>瀹氫箟瀵硅薄锛欰irQualitySensor</para>
- /// </summary>
- AirQualitySensor = 0x0302,
+
}
/// <summary>
--
Gitblit v1.8.0