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 | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/Command.cs b/HDL_ON/Entity/Enumerative/Command.cs
index 3df4341..a95726f 100644
--- a/HDL_ON/Entity/Enumerative/Command.cs
+++ b/HDL_ON/Entity/Enumerative/Command.cs
@@ -14,6 +14,75 @@
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>
/// 璇诲彇娓╂帶鍣ㄤ富鏈烘寚浠�
@@ -1222,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>
/// 甯冮槻璁剧疆
@@ -2741,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