From f9bbfe61af837ef92d0a57a7075597e99051159a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 23 九月 2020 12:40:14 +0800
Subject: [PATCH] .......

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

diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
index be83f7f..caf9e46 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
@@ -118,6 +118,12 @@
 MPR0310-ZB.10 = 2300 / 3璺紑鍏冲皬妯″潡 / 3璺紑鍏冲皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
 ;鏂规偊鏂伴灏忔ā鍧�
 MFA01-ZB.10 = 2310 / 鏂规偊鏂伴灏忔ā鍧� / 鏂规偊鏂伴灏忔ā鍧� / 2300 / 缁х數鍣� / 鏂伴妯″潡
+;鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡
+MLR0310-ZB.20= 2311 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡
+MLR0205-ZB.18= 2312 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 / 2300 / 缁х數鍣� / 寮�鍏虫ā鍧�
+;娆ф爣14璺共鎺ョ偣灏忔ā鍧�
+MLDRY14-ZB.18= 2313 / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 娆ф爣14璺共鎺ョ偣灏忔ā鍧� / 2300 / 缁х數鍣� / 骞叉帴鐐规ā鍧�
 
 ;***************************************************************
 ;                           璋冨厜鍣ㄨ澶�
@@ -133,9 +139,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