From ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 三月 2021 09:37:54 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/HDL/Operation/MyEnum.cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/MyEnum.cs b/Crabtree/SmartHome/HDL/Operation/MyEnum.cs
index cdcfcab..cc7c8e5 100644
--- a/Crabtree/SmartHome/HDL/Operation/MyEnum.cs
+++ b/Crabtree/SmartHome/HDL/Operation/MyEnum.cs
@@ -86,9 +86,18 @@
LightLogic = 0x0108,
LightMixDimming = 0x0109,
LightMixSwitch = 0x010A,
- LightEnergySocket = 0x010B,//鑳芥簮寮�鍏筹紝甯﹀姛鐜囩殑鎻掑骇
- LightEnergySwitch = 0x010C,//甯﹀姛鐜囩殑缁х數鍣�
- LightSwitchSocket = 0x0188,//鑷畾涔夌壒娈婄殑缁х數鍣紝浣滄彃搴т娇鐢�
+ /// <summary>
+ /// 鑳芥簮寮�鍏筹紝甯﹀姛鐜囩殑鎻掑骇
+ /// </summary>
+ LightEnergySocket = 0x010B,
+ /// <summary>
+ /// 甯﹀姛鐜囩殑缁х數鍣�
+ /// </summary>
+ LightEnergySwitch = 0x010C,
+ /// <summary>
+ /// 鑷畾涔夌壒娈婄殑缁х數鍣紝浣滄彃搴т娇鐢�
+ /// </summary>
+ LightSwitchSocket = 0x0188,
/// <summary>
/// 绐楀笜
/// </summary>
@@ -1913,6 +1922,14 @@
SetGateWayLocalEncryption = 0x303E,
SetReadGateWayLocalEncryptionACK = 0x303F,
+ /// <summary>
+ /// 淇敼缃戝叧杩滅▼杩炴帴鍩熷悕鍦板潃
+ /// </summary>
+ SetGateWayMqttURLAddress = 0x3046,
+ SetGateWayMqttURLAddressACK = 0x3047,
+
+
+
/// <summary>
/// 0xF003
@@ -3009,4 +3026,19 @@
WiFiOffline = 5,
}
+
+ /// <summary>
+ /// 鍦烘櫙绫诲瀷
+ /// </summary>
+ public enum SceneType
+ {
+ /// <summary>
+ /// 鏅�氬満鏅�
+ /// </summary>
+ OrdinaryScenes = 1,
+ /// <summary>
+ /// 鐢靛奖changing
+ /// </summary>
+ MovieScene = 2,
+ }
}
--
Gitblit v1.8.0