From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
index 7a871b7..8727da9 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 / 鏅鸿兘缃戝叧 / 鏅鸿兘缃戝叧
 
@@ -105,6 +113,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 +126,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 +147,9 @@
 ;妯″潡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 = 2802 / S-one 鏅鸿兘闂ㄩ攣 / S-one 鏅鸿兘闂ㄩ攣 / 2800 / 闂ㄩ攣 / 鏅鸿兘闂ㄩ攣
 
 ;***************************************************************
 ;                           绌鸿皟璁惧

--
Gitblit v1.8.0