From 71c7ad13169695913282962a460858e13b6c0969 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 29 十二月 2020 14:33:49 +0800 Subject: [PATCH] 2020-12-29-1 --- ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini index 2cccf66..aa121c1 100755 --- a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini +++ b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini @@ -8,10 +8,18 @@ ;澧欒缃戝叧銆� 1 = 0 / 澧欒缃戝叧 / 澧欒缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 +;澧欒缃戝叧銆� +10 = 0 / 澧欒缃戝叧 / 澧欒缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 ;鏅鸿兘缃戝叧E7 6 = 0 / 鏅鸿兘缃戝叧E7 / 鏅鸿兘缃戝叧E7 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 ;Mini缃戝叧銆� 11 = 0 / Mini缃戝叧 / Mini缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 +;鏅鸿兘缃戝叧E7 +12 = 0 / 鏅鸿兘缃戝叧E7 / 鏅鸿兘缃戝叧E7 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 +;Mini缃戝叧銆� +13 = 0 / Mini缃戝叧 / Mini缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 +;鐜舰缃戝叧銆� +15 = 0 / 鐜舰缃戝叧 / 鐜舰缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 ;鐜舰缃戝叧銆� 16 = 0 / 鐜舰缃戝叧 / 鐜舰缃戝叧 / 0 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧 @@ -119,11 +127,11 @@ ;鏂规偊鏂伴灏忔ā鍧� MFA01-ZB.10 = 2310 / 鏂规偊鏂伴灏忔ā鍧� / 鏂规偊鏂伴灏忔ā鍧� / 2300 / 缁х數鍣� / 鏂伴妯″潡 ;鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 -MLR0310-ZB.20= 2311 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� +MLR0310-ZB.20= 2301 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� ;娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 -MLR0205-ZB.18= 2312 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� -;娆ф爣14璺共鎺ョ偣灏忔ā鍧� -MLDRY14-ZB.18= 2313 / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧� +MLR0205-ZB.18= 2315 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧� +;7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 +MLDRY7-ZB.18= 2320 / 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 / 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧� ;*************************************************************** ; 璋冨厜鍣ㄨ澶� @@ -139,9 +147,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 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣 ;*************************************************************** ; 绌鸿皟璁惧 @@ -177,6 +195,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 / 绌烘皵璐ㄩ噺浼犳劅鍣� / 浼犳劅鍣� + + ;*************************************************************** ; 绗笁鏂硅澶� @@ -204,4 +239,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