Skip to content

K
k-sdk
Commit abb3233f authored by 尹佳钦's avatar 尹佳钦
Browse files
Options

2020/09/16 111

parent 66466c28
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 26 deletions
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json
View file @ abb3233f
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
},{ },{
"modleId": "00038602", "modleId": "00038602",
"productCode": "3021", "productCode": "3021",
"productName": "铂金系列·白色干触点窗帘面板Z3S(安心加）" "productName": "铂金系列·白色干触点窗帘面板Z3S(安心加)"
},{ },{
"modleId": "00068621", "modleId": "00068621",
"productCode": "3022", "productCode": "3022",
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
},{ },{
"modleId": "03020001", "modleId": "03020001",
"productCode": "3076", "productCode": "3076",
"productName": "环境传感器KZ3S（KONKE)" "productName": "环境传感器KZ3S(KONKE)"
},{ },{
"modleId": "00510001", "modleId": "00510001",
"productCode": "3046", "productCode": "3046",
...@@ -181,32 +181,39 @@ ...@@ -181,32 +181,39 @@
"productCode": "3057", "productCode": "3057",
"productName": "邦德系列.白色声光传感器(KONKE)" "productName": "邦德系列.白色声光传感器(KONKE)"
},{ },{
"modleId": "", "modleId": "02020000",
"productCode": "", "productCode": "3067",
"productName": "" "productName": "智能窗帘电机Z3S(KONKE)(说明：杜亚款)"
},{ },{
"modleId": "", "modleId": "02020001",
"productCode": "", "productCode": "3068",
"productName": "" "productName": "威刚系列.智能窗帘电机Z3S(KONKE)(说明：威士达款)"
},{ },{
"modleId": "", "modleId": "01000002",
"productCode": "", "productCode": "3069",
"productName": "" "productName": "双路智能灯控模块Z3S(KONKE)"
},{ },{
"modleId": "", "modleId": "04028301",
"productCode": "", "productCode": "3070",
"productName": "" "productName": "传感器模块Z3S(KONKE)"
},{
"modleId": "03300001",
"productCode": "3071",
"productName": "智能水阀控制器Z3S(KONKE)"
},{
"modleId": "03310001",
"productCode": "3072",
"productName": "智能燃气机械臂控制器Z3S(KONKE)"
},{
"modleId": "01020001",
"productCode": "3073",
"productName": "幻彩灯带控制器Z3S(KONKE)"
},{
"modleId": "00648631",
"productCode": "3077",
"productName": "多功能面板(亚运村临时项目)"
} }
] ]
} }
智能窗帘电机Z3S(KONKE) （说明：杜亚款） 0x02020000 3067
威刚系列.智能窗帘电机Z3S(KONKE) （说明：威士达款） 0x02020001 3068
双路智能灯控模块Z3S(KONKE) 0x01000002 3069
传感器模块Z3S(KONKE) 0x04028301 3070
智能水阀控制器Z3S(KONKE) 0x03300001 3071
智能燃气机械臂控制器Z3S(KONKE) 0x03310001 3072
幻彩灯带控制器Z3S(KONKE) 0x01020001 3073
485转ZigBee模块Z3S(KONKE) 3074
红外遥控器Z3S（亚运村临时项目) 0x00800000(透传) 1043
多功能面板（亚运村临时项目） 0x00648631 3077
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c
View file @ abb3233f
...@@ -521,7 +521,7 @@ void kk_device_config_load_from_db(void) ...@@ -521,7 +521,7 @@ void kk_device_config_load_from_db(void)
kk_device_table_s *ptr = kk_zb_device_table; kk_device_table_s *ptr = kk_zb_device_table;
while(ptr!=NULL){ while(ptr!=NULL){
if(ptr->productCode!=NULL){ if(ptr->productCode!=NULL&&strlen(ptr->productCode)!=0){
kk_device_config_map_add(ptr->productCode); kk_device_config_map_add(ptr->productCode);
} }
ptr = ptr->next; ptr = ptr->next;
...@@ -529,3 +529,12 @@ void kk_device_config_load_from_db(void) ...@@ -529,3 +529,12 @@ void kk_device_config_load_from_db(void)
} }
void emberAfPluginDeviceTableInitialized(void)
{
kk_device_db_load();
kk_print_device_table();
kk_load_dev_map_table();
kk_device_map_print();
kk_device_config_load_from_db();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment