From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期一, 14 十二月 2020 09:59:01 +0800 Subject: [PATCH] 请合并代码，完成晾衣架最终功能。 --- ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini old mode 100755 new mode 100644 index 7a871b7..abed5f8 --- a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini +++ b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini @@ -105,6 +105,9 @@ MGCD01/M-ZB.10 = 1306 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣� ;PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� MSPM25/M-ZB.10 = 1307 / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / 1307 / 绌烘皵璐ㄩ噺 / 浼犳劅鍣� +;娓╂箍搴︿紶鎰熷櫒(杩欎釜涓滆タ濂藉儚鏈変袱涓�) +MTH01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣� +MSHIM01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣� ;*************************************************************** ; 缁х數鍣ㄨ澶� @@ -115,6 +118,12 @@ MPR0310-ZB.10 = 2300 / 3璺紑鍏冲皬妯″潡 / 3璺紑鍏冲皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� ;鏂规偊鏂伴灏忔ā鍧� MFA01-ZB.10 = 2310 / 鏂规偊鏂伴灏忔ā鍧� / 鏂规偊鏂伴灏忔ā鍧� / 2300 / 缁х數鍣� / 鏂伴妯″潡 +;鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 +MLR0310-ZB.20= 2301 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� +;娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 +MLR0205-ZB.18= 2315 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� +;7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 +MLDRY7-ZB.18= 2320 / 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 / 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧� ;*************************************************************** ; 璋冨厜鍣ㄨ澶� @@ -130,9 +139,19 @@ ;妯″潡ID=DeviceConcreteType鐨勫�� / 璁惧鐨勫畼鏂瑰悕瀛� / 璁惧榛樿澶囨敞鍚嶅瓧 / DeviceBeloneType鐨勫�� /璁惧鎵�灞炵绫荤殑鍚嶅瓧 / 璁惧绫诲瀷鍚嶅瓧 ;鏅鸿兘闂ㄩ攣(H06C)銆� -H06C = 2800 / S-one 鏅鸿兘闂ㄩ攣 / S-one 鏅鸿兘闂ㄩ攣 / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +H06C = 2800 / H06C 鏅鸿兘闂ㄩ攣 / H06C 鏅鸿兘闂ㄩ攣 / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 ;鏅鸿兘闂ㄩ攣(S-one)銆� -S-one = 2802 / H06C 鏅鸿兘闂ㄩ攣 / H06C 鏅鸿兘闂ㄩ攣 / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +S-One Pro = 2802 / S-One Pro 鏅鸿兘闂ㄩ攣 / S-One Pro 鏅鸿兘闂ㄩ攣 / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +;鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1TF 浜鸿劯+鎸囩汗鐗� +AT-1TF = 2803 / 鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1TF / 鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1TF / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +;鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1F 浜鸿劯璇嗗埆 +AT-1F = 2804 / 鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1F/ 鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1F/ 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +;鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1T 鎸囩汗 +AT-1T = 2805 /鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1T /鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1T / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +;鏅鸿兘闂ㄩ攣 HAT-1B 闈欒剦绾圭増 +HAT-1B = 2806 / 鏅鸿兘闂ㄩ攣 HAT-1B / 鏅鸿兘闂ㄩ攣 HAT-1B / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 +;鏅鸿兘闂ㄩ攣 HAT-1T 鎸囩汗 +HAT-1T = 2807 / 鏅鸿兘闂ㄩ攣 HAT-1T / 鏅鸿兘闂ㄩ攣 HAT-1T / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 ;*************************************************************** ; 绌鸿皟璁惧 @@ -168,6 +187,23 @@ ;zigbee杞琤uspro鍗忚杞崲鍣� MBUS/GW-ZB.10 = 4201 / zigbee杞琤uspro鍗忚杞崲鍣� / zigbee杞琤uspro鍗忚杞崲鍣� / 4200 / 杞崲鍣� / 杞崲鍣� +;*************************************************************** +; 鏅捐。鏋惰澶� +;*************************************************************** +;妯″潡ID=DeviceConcreteType鐨勫�� / 璁惧鐨勫畼鏂瑰悕瀛� / 璁惧榛樿澶囨敞鍚嶅瓧 / DeviceBeloneType鐨勫�� / 璁惧鎵�灞炵绫荤殑鍚嶅瓧 / 璁惧绫诲瀷鍚嶅瓧 + +;鏅捐。鏋� +MDRYC/SE-ZB.10 = 5000 / 鏅鸿兘鏅捐。鏋� / 鏅鸿兘鏅捐。鏋� / 5000 / 鏅鸿兘鏅捐。鏋� / 鏅捐。鏋� + +;*************************************************************** +; 鐜璁惧 +;*************************************************************** +;妯″潡ID=DeviceConcreteType鐨勫�� / 璁惧鐨勫畼鏂瑰悕瀛� / 璁惧榛樿澶囨敞鍚嶅瓧 / DeviceBeloneType鐨勫�� / 璁惧鎵�灞炵绫荤殑鍚嶅瓧 / 璁惧绫诲瀷鍚嶅瓧 + +;绌烘皵璐ㄩ噺浼犳劅鍣� +MSTHCFM25-ZB.10 = 5200 / 绌烘皵璐ㄩ噺浼犳劅鍣�/ 绌烘皵璐ㄩ噺浼犳劅鍣� / 5200 / 绌烘皵璐ㄩ噺浼犳劅鍣� / 浼犳劅鍣� + + ;*************************************************************** ; 绗笁鏂硅澶� @@ -195,4 +231,6 @@ A417 = 0 / 鎻掑骇 / 0 / 0 / 0 / 寮�鍏虫ā鍧� A418 = 0 / 鐏厜 / 0 / 0 / 0 / 璋冨厜妯″潡 A419 = 0 / 骞叉帴鐐� / 0 / 0 / 0 / 寮�鍏虫ā鍧� -A420 = 0 / 鑹叉俯鐏� / 0 / 0 / 0 / 璋冨厜妯″潡 \ No newline at end of file +A420 = 0 / 鑹叉俯鐏� / 0 / 0 / 0 / 璋冨厜妯″潡 +A421 = 0 / 鏅捐。鏋� / 0 / 0 / 0 /鏅鸿兘鏅捐。鏋� +A422 = 0 / 绌烘皵璐ㄩ噺浼犳劅鍣� / 0 / 0 / 0 / 绌烘皵璐ㄩ噺浼犳劅鍣� \ No newline at end of file -- Gitblit v1.8.0