From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a87b097..9bac1cb 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,20 +45,20 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 2,
}
/// <summary>
- /// 鍔熻兘绫诲埆
+ /// 鍔熻兘绫诲瀷
/// </summary>
public enum FunctionType
{
- Scene = 0x0001,
- MovieScene = 0x0002,
+ Scene = 0x0A01,
+ MovieScene = 0x0A02,
Relay = 0x0201,
Dimmer = 0x0202,
/// <summary>
@@ -72,24 +72,21 @@
AC = 0x0401,
FloorHeating = 0x0402,
- Fan = 0x1002,
- TV = 0x1003,
+ Fan = 0x1001,
+ TV = 0x1002,
Socket =0x0102,
- PM10 = 0x0b01,
- PM25 = 0x0b06,
- //Noise = 0x0b03,
- WindPower = 0x0b04,
- CO2 = 0x0b07,
- Temp = 0x0b02,
- TVOC = 0x0b05,
- Humidity = 0x0b03,
+ PM25 = 0x0506,
+ CO2 = 0x0507,
+ Temp = 0x0502,
+ TVOC = 0x0505,
+ Humidity = 0x0503,
- A31Music = 0x1A23,
+ A31Music = 0x0902,
}
/// <summary>
- /// 鍔熻兘绫诲瀷
+ /// 鍔熻兘绫诲埆
/// </summary>
public enum FunctionCategory
{
@@ -98,7 +95,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -138,11 +135,11 @@
/// <summary>
/// 闊充箰
/// </summary>
- Music = 0x1A,
+ Music = 0x09,
/// <summary>
/// 浼犳劅鍣�
/// </summary>
- Sensor = 0x0B,
+ Sensor = 0x05,
///// <summary>
///// 闂ㄩ攣
///// </summary>
@@ -291,9 +288,6 @@
VideoIntercom = 0x21,
}
-
-
-
public enum InfraredCode_TV
{
--
Gitblit v1.8.0