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/Enum.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
index 0052f69..9fd2b8a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -85,6 +85,10 @@
/// 鏌ヨ璁惧鐨勯暅鍍忕被鍨嬪拰鐗堟湰
/// </summary>
Ota = 25,
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺浼犳劅鍣╛CO2
+ /// </summary>
+ CO2 = 1037,
}
/// <summary>
@@ -126,7 +130,7 @@
/// </summary>
ColorTempPhysicalMaxMireds = 16396,
/// <summary>
- ///娓╁害娴嬮噺 娓╁害
+ ///娓╁害娴嬮噺 娓╁害 浜屾哀鍖栫⒊ PM2.5
/// </summary>
MeasuredValue = 0,
/// <summary>
@@ -168,7 +172,17 @@
///鐏叿绉嶇被
/// </summary>
ColorCapabilities = 16394,
-
+
+ /// <summary>
+ ///鏅捐。鏋舵椂闂�
+ /// </summary>
+ AirerTime = 16385,
+
+ /// <summary>
+ ///鏅捐。鏋跺墿浣欐椂闂�
+ /// </summary>
+ AirerRemainTime = 16386,
+
#region 绐楀笜
/// <summary>
///绐楀笜璁惧绫诲瀷
--
Gitblit v1.8.0