From ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 28 八月 2021 10:27:10 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

---
 HDL_ON/Entity/Function/Function.cs |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 3202c35..1d2e85d 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -917,7 +917,7 @@
         /// </summary>
         public const string FilterRemain = "filter_remain";
         /// <summary>
-        /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+        /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛� 
         /// </summary>
         public const string FilterTimeout = "filter_timeout";
 
@@ -1274,6 +1274,10 @@
         /// 闈掕悕鐜浼犳劅鍣�
         /// </summary>
         public const string SensorEnvironment3 = "sensor.environment3";
+        /// <summary>
+        /// 鐢查啗
+        /// </summary>
+        public const string SensorHcho = "sensor.hcho";
 
         /// <summary>
         /// 鐜浼犳劅鍣╯pk鍒楄〃
@@ -1290,6 +1294,7 @@
             spkList.Add(SensorEnvironment);
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
+            spkList.Add(SensorHcho);
             return spkList;
         }
 
@@ -1362,6 +1367,10 @@
         /// 绾㈠椋庢墖
         /// </summary>
         public const string FanIr = "ir.fan";
+        /// <summary>
+        /// 鏅鸿兘绌哄紑
+        /// </summary>
+        public const string AirSwitch = "electrical.breaker";
 
         #region 娑傞甫
         /// <summary>
@@ -1404,6 +1413,7 @@
             spkList.Add(ElectricTuyaFan);
             spkList.Add(ElectricTuyaWeepRobot);
             spkList.Add(ElectricTuyaWaterValve);
+            spkList.Add(AirSwitch);
             return spkList;
         }
 

--
Gitblit v1.8.0