From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/Entity/Enumerative/Command.cs | 138 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/Command.cs b/HDL_ON/Entity/Enumerative/Command.cs
index 6e7b853..a95726f 100644
--- a/HDL_ON/Entity/Enumerative/Command.cs
+++ b/HDL_ON/Entity/Enumerative/Command.cs
@@ -1,6 +1,8 @@
锘縰sing System;
-namespace HDL_ON.Entity.Enumerative
+namespace HDL_ON.Entity
{
+
+
/// <summary>
/// 鎿嶄綔鐮�
/// </summary>
@@ -11,6 +13,75 @@
/// </summary>
ReadAnalog = 0xE50A,
ReadAnalogACK = 0xE50B,
+
+ #region 鏂伴鍗忚
+ //鏂伴鍗忚鎺у埗
+ //闄勫姞鏁版嵁锛� 鏂伴閫氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛�
+ FreshAirControl = 0x144A,
+ //杩斿洖锛氭柊椋庨�氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛�+妯℃嫙閲忥紙2byte==16bit锛�+
+ //瀹ゅ唴娓╁害(4byte) + 瀹ゅ娓╁害(4byte) + 瀹ゅ唴婀垮害(4byte)+ PM2.5(4byte) + TVOC(4byte) + CO2(4byte)
+ FreshAirControlACK = 0x144B,
+ //2.鏂伴鍗忚璇荤姸鎬�
+ //闄勫姞鏁版嵁锛� 鏂伴閫氶亾鍙凤紙1 - 200锛�
+ FreshAirRead = 0x144C,
+ //杩斿洖锛氭柊椋庨�氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛� +妯℃嫙閲忥紙2byte==16bit锛�+
+ //瀹ゅ唴娓╁害(4byte) + 瀹ゅ娓╁害(4byte) + 瀹ゅ唴婀垮害(4byte)+ PM2.5(4byte) + TVOC(4byte) + CO2(4byte)
+ FreshAirReadACK = 0x144D,
+ #endregion
+
+ #region 閲戣寕搴� 鏄嗘槑 娓╁窞 鏂伴鍗忚
+ /// <summary>
+ /// 闄勫姞鏁版嵁闀垮害:1
+ /// 鏂伴缂栧彿 1~200
+ /// </summary>
+ FreshAirRead_JinMao = 0x1446,
+ /// <summary>
+ /// 闄勫姞鏁版嵁闀垮害:30
+ /// 1 鏂伴缂栧彿 1~200
+ /// 2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+ /// 3 寮�鍏� 0-鍏虫満锛�1-寮�鏈�
+ /// 4 杩愯妯″紡 1-閫氶锛�2-鍔犳箍
+ /// 5 鑺傝兘鑸掗�傞�夋嫨 1-鑸掗�傦紝2-鑺傝兘
+ /// 6 椋庨�熸。浣� 0-鑷姩锛�1-1妗ｏ紝2-2妗ｏ紝3-3妗�
+ /// 7 婀垮害璁惧畾 %
+ /// 8 瀹ゅ唴娓╁害鍊� 鈩�
+ /// 9 瀹ゅ唴婀垮害鍊� 鈩�
+ /// 10 杩囨护缃戝墿浣� %
+ /// 11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�
+ /// </summary>
+ FreshAirReadACK_JinMao = 0x1447,
+ /// <summary>
+ /// 闄勫姞鏁版嵁闀垮害:4
+ /// 1 鏂伴缂栧彿 1~200
+ /// 2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+ /// 3 寮�鍏� 0-鍏虫満锛�1-寮�鏈�
+ /// 4 杩愯妯″紡 1-閫氶锛�2-鍔犳箍
+ /// 5 鑺傝兘鑸掗�傞�夋嫨 1-鑸掗�傦紝2-鑺傝兘
+ /// 6 椋庨�熸。浣� 0-鑷姩锛�1-1妗ｏ紝2-2妗ｏ紝3-3妗�
+ /// 7 婀垮害璁惧畾 %
+ /// 8 瀹ゅ唴娓╁害鍊� 鈩�
+ /// 9 瀹ゅ唴婀垮害鍊� 鈩�
+ /// 10 杩囨护缃戝墿浣� %
+ /// 11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�
+ /// </summary>
+ FreshAirControl_JinMao = 0x1448,
+ /// <summary>
+ /// 闄勫姞鏁版嵁闀垮害:30
+ /// 1 鏂伴缂栧彿 1~200
+ /// 2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+ /// 3 寮�鍏� 0-鍏虫満锛�1-寮�鏈�
+ /// 4 杩愯妯″紡 1-閫氶锛�2-鍔犳箍
+ /// 5 鑺傝兘鑸掗�傞�夋嫨 1-鑸掗�傦紝2-鑺傝兘
+ /// 6 椋庨�熸。浣� 0-鑷姩锛�1-1妗ｏ紝2-2妗ｏ紝3-3妗�
+ /// 7 婀垮害璁惧畾 %
+ /// 8 瀹ゅ唴娓╁害鍊� 鈩�
+ /// 9 瀹ゅ唴婀垮害鍊� 鈩�
+ /// 10 杩囨护缃戝墿浣� %
+ /// 11 杩囨护缃戜娇鐢ㄨ秴鏃�
+ /// </summary>
+ FreshAirControlACK_JinMao = 0x1449,
+ #endregion
+
#region 缁垮缓娓╂帶鍣ㄥ崗璁�
/// <summary>
@@ -1220,24 +1291,6 @@
LogicstateControl = 0xE014,
LogicstateControlACK = 0xE015,
- #region 鏂伴鍗忚
- //鏂伴鍗忚鎺у埗
- //闄勫姞鏁版嵁锛� 鏂伴閫氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛�
- FreshAirControl = 0x144A,
- //杩斿洖锛氭柊椋庨�氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛�+妯℃嫙閲忥紙2byte==16bit锛�+
- //瀹ゅ唴娓╁害(4byte) + 瀹ゅ娓╁害(4byte) + 瀹ゅ唴婀垮害(4byte)+ PM2.5(4byte) + TVOC(4byte) + CO2(4byte)
- FreshAirControlACK = 0x144B,
-
-
- //2.鏂伴鍗忚璇荤姸鎬�
- //闄勫姞鏁版嵁锛� 鏂伴閫氶亾鍙凤紙1 - 200锛�
- FreshAirRead = 0x144C,
- //杩斿洖锛氭柊椋庨�氶亾鍙凤紙1 - 200锛� + 寮�鍏筹紙0锛�1锛� + 椋庨�燂紙0 鍏筹紝1浣庯紝2涓紝3楂橈級 + 妯″紡锛�0鎵嬪姩锛�1 鑷姩,2 鏅鸿兘锛�3 瀹氭椂锛� +妯℃嫙閲忥紙2byte==16bit锛�+
- //瀹ゅ唴娓╁害(4byte) + 瀹ゅ娓╁害(4byte) + 瀹ゅ唴婀垮害(4byte)+ PM2.5(4byte) + TVOC(4byte) + CO2(4byte)
- FreshAirReadACK = 0x144D,
-
-
- #endregion
/// <summary>
/// 甯冮槻璁剧疆
@@ -1344,13 +1397,25 @@
/// 鍗曡矾璋冭妭璇诲彇鐘舵��
/// 鍥炶矾鏁帮紙1B锛夛紝鍚勫洖璺紑鍏抽噺锛� n B锛�
/// </summary>
- ReadLightEquipmentAllLoopBrightness = 0x0033,
+ ReadLightAllLoopBrightness = 0x0033,
/// <summary>
/// 0x0034
/// 鍗曡矾璋冭妭璇诲彇鐘舵�佸洖澶�
/// 1byte锛堝洖璺�绘暟锛塶byte(姣忎釜瀛楄妭琛ㄧず瀵瑰簲鍥炶矾鐨勪寒搴�0-100)
/// </summary>
- ReadLightEquipmentAllLoopBrightnessACK = 0x0034,
+ ReadLightAllLoopBrightnessACK = 0x0034,
+ /// <summary>
+ /// 0xE4F4
+ /// 澧炲姞鍗曚釜鍥炶矾浜害鍊肩殑璇诲彇
+ /// 鍥炶矾鍙�
+ /// </summary>
+ ReadLightSingleLoopBrightness = 0xE4F4,
+ /// <summary>
+ /// 0xE4F5
+ /// 澧炲姞鍗曚釜鍥炶矾浜害鍊肩殑璇诲彇杩斿洖
+ /// 1byte锛堝洖璺彿锛�2byte锛堟垚鍔熸垨鑰呭け璐ワ級3byte(鍥炶矾鐨勪寒搴�0-100)
+ /// </summary>
+ ReadLightSingleLoopBrightnessACK = 0xE4F5,
/// <summary>
/// 璇诲彇鑳芥簮寮�鍏冲姛鐜�
@@ -1663,6 +1728,20 @@
/// 鍏蜂綋鍙傛暟瑙佷笅琛�(鍏朵腑鍥炶矾鎴栬�呴�氶亾鏁帮紝澶囨敞涓洪噸澶嶉儴鍒嗭紝鏃犻渶閲嶅杩斿洖锛屽綋鍓嶇姸鎬佷笉鐢ㄤ慨鏀�)
/// </summary>
ReadDeviceLoopInfoACK = 0xE44B,
+ // 浼犳劅鍣ㄥ箍鎾ā鎷熼噺
+ //[0] 澶х被鍒� 浼犳劅鍣� 5锛堝浐瀹氾級
+ //[1] 灏忕被鍒� 璇﹁鏂版ā鎷熼噺鍗忚
+ //[2] 閫氶亾鍙� 1-N
+ //[3] 绫诲瀷 0淇濈暀 1鏃犵鍙�4Byte鏁村舰 2鏈夌鍙�4Byte鏁村舰 3Float褰紙浠Ｂ憋級
+ // 娉細灏忔暟鐐圭殑鐢ㄦ诞鐐硅〃绀猴紝鏁存暟涓嶈〃绀哄皬鏁扮偣
+ //
+ //[4] 鍗曚綅 姣忎釜灏忕被瀹氫箟涓嶅悓鐨勫崟浣嶏紝鍗曚綅鐩稿悓灏忕被涓嶅悓鐨勫崟浣嶆暟鍊肩浉鍚�
+ //[5] data
+ //[6] data 鏁版嵁鍊奸珮浣嶅湪鍓嶏紝浣庝綅鍦ㄥ悗
+ //[7] data
+ // .......
+ New_Analog_Quantity_BROADCAST = 0x353A,
+
/// <summary>
/// 璁剧疆绠�鏄撶紪绋嬭澶囧熀鏈俊鎭�
/// 鎿嶄綔鐮�: 0xE44C
@@ -1811,6 +1890,9 @@
/// 璇诲彇闈㈡澘鐘舵��
/// </summary>
ReadInstructionPanelKey = 0xE3DA,
+ /// <summary>
+ /// 0xE3DB
+ /// </summary>
ReadInstructionPanelKeyACK = 0xE3DB,
@@ -1864,8 +1946,8 @@
/// 閫�鍑哄畨瑁呰皟璇� 鍛戒护E3E0 闄勫姞鏁版嵁3涓猙yte 绗竴涓�17 绗簩涓� 238 绗笁涓�2 鍙嶉E3E1 鍙嶉鐨勯檮鍔犳暟鎹涓�涓猙yte涓�17 绗簩涓猙yte涓�238 绗笁涓猙yte涓�2鏃惰〃绀洪��鍑哄畨瑁呰皟璇曟垚鍔�
/// 鐐瑰姩 鍛戒护E3E0 闄勫姞鏁版嵁2涓猙yte 绗竴涓�33 绗簩涓細鐐瑰姩寮�涓�1锛岀偣鍔ㄥ叧2
/// </summary>
- UpdataCurtainModelStutas = 0xE3E0,
- UpdataCurtainModelStutasACK = 0xE3E1,
+ SetCurtainModelStutas = 0xE3E0,
+ SetCurtainModelStutasACK = 0xE3E1,
/// <summary>
/// 绐楀笜妯″潡鐘舵�佸箍鎾洖澶�
@@ -1975,8 +2057,8 @@
/// [12]鍐叉礂鏍囪 楂�4浣嶏細1鎸夐敭鎵ц鍐叉礂銆�0闈炴寜閿墽琛�(妯″潡瀹氭椂鍐叉礂)鍐叉礂锛屼綆4浣嶏細 0锛氫笉鍐叉礂銆�1鍐叉礂 (1byte)
/// [13]鍐叉礂鏃堕棿 1~30(min) (1byte)
/// </summary>
- ReadFoolHeat = 0x1C5E,
- ReadFoolHeatACK = 0x1C5F,
+ ReadFloorHeat = 0x1C5E,
+ ReadFloorHeatACK = 0x1C5F,
/// <summary>
/// 鍦扮儹鎺у埗鎸囦护
/// [0]number(1-6) (1byte)
@@ -2005,8 +2087,8 @@
/// [12]鍐叉礂鏍囪 楂�4浣嶏細1鎸夐敭鎵ц鍐叉礂銆�0瀹氭椂鍐叉礂)鍐叉礂锛屼綆4浣嶏細 0锛氫笉鍐叉礂銆�1鍐叉礂 (1byte)
/// [13]鍐叉礂鏃堕棿 1~30(min) (1byte)
/// </summary>
- SetFoolHeat = 0x1C5C,
- SetFoolHeatACK = 0x1C5D,
+ SetFloorHeat = 0x1C5C,
+ SetFloorHeatACK = 0x1C5D,
///Serverx_FH_CMD E45A
///0 鍦扮儹鍙� 1-N
///1 宸ヤ綔妯″紡 0鍦扮儹妯″紡銆�1鍦板喎妯″紡銆�2鍦扮儹鍔熺巼鎺у埗銆�3鍦板喎鍔熺巼鎺у埗銆�4鑷姩
@@ -2710,7 +2792,7 @@
///1 閫昏緫鍥炶矾鍙�
///2 鏁翠綋浜害
///3 棰滆壊鍙� 鍥哄畾涓� 254
- ///4 杩愯鏃舵暗楂樹綅
+ ///4 杩愯鏃堕棿 楂樹綅
///5 杩愯鏃堕棿 浣庝綅
///6 閫昏緫鐏被鍨� 1-5//1鍗曡矾 2CCT 3RGB 4RGBW 5RGBWY
///7 閫昏緫鍥炶矾 閫氶亾1鐨勫�� //RGB鏈�澶у�兼槸255 鍏跺畠绫讳负鏈�澶т负100
--
Gitblit v1.8.0