Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_3001.json

@@ -3,18 +3,11 @@
 	"config":[
 	{
 		"identity":"PowerSwitch_1",
-		"endpoint":18,
-		"cluster":"0x0011",
-		"attribute":"0x0022",
-		"reportFunc":"A",
-		"controlFunc":"B"
-	},{
-		"identity":"PowerSwitch_2",
-		"endpoint":19,
-		"cluster":"0x0033",
-		"attribute":"0x0044",
-		"reportFunc":"C",
-		"controlFunc":"D"
+		"endpoint":1,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	}
 	]
 }	

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_3002.json

@@ -2,19 +2,19 @@
 	"productCode":"3002",
 	"config":[
 	{
-		"identity":"AAA",
-		"endpoint":11,
-		"cluster":"0x1111",
-		"attribute":"0x2222",
-		"reportFunc":"zclOnOff_On",
-		"controlFunc":"zclOnOff_On"
+		"identity":"PowerSwitch_1",
+		"endpoint":1,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	},{
-		"identity":"BBB",
-		"endpoint":22,
-		"cluster":"0x3333",
-		"attribute":"0x4444",
-		"reportFunc":"zclOnOff_Off",
-		"controlFunc":"zclOnOff_Off"
+		"identity":"PowerSwitch_2",
+		"endpoint":2,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	}
 	]
 }	

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_3003.json

@@ -2,26 +2,26 @@
 	"productCode":"3003",
 	"config":[
 	{
-		"identity":"AAA",
-		"endpoint":11,
-		"cluster":"0x1111",
-		"attribute":"0x2222",
-		"reportFunc":"zclOnOff_On",
-		"controlFunc":"zclOnOff_On"
+		"identity":"PowerSwitch_1",
+		"endpoint":1,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	},{
-		"identity":"BBB",
-		"endpoint":22,
-		"cluster":"0x3333",
-		"attribute":"0x4444",
-		"reportFunc":"zclOnOff_Off",
-		"controlFunc":"zclOnOff_Off"
+		"identity":"PowerSwitch_2",
+		"endpoint":2,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	},{
-		"identity":"CCCC",
-		"endpoint":33,
-		"cluster":"0x5555",
-		"attribute":"0x6666",
-		"reportFunc":"zclOnOff_Off",
-		"controlFunc":"zclOnOff_Off"
+		"identity":"PowerSwitch_3",
+		"endpoint":3,
+		"cluster":"0x0006",
+		"attribute":"0x0000",
+		"reportFunc":"kk_tsl_report_global_onoff",
+		"controlFunc":"zclOnOff"
 	}
 	]
 }	

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_manager.c

 #include "kk_device_manager.h"
-
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -417,24 +415,7 @@ char *kk_match_productCode(const char* modelId)
 	return NULL;
 }
 
-typedef struct kk_dev_config_item{
-	char * identity;
-	char * reportFuncName;
-	char * controlFuncName;
-	kk_rpc_report * reportFunc;
-	kk_rpc_set * controlFunc;
-	uint8_t endpoint;
-	uint16_t cluster;
-	uint16_t attribute;
-	struct kk_dev_config_item * next;
-}kk_dev_config_item;
 
-
-typedef struct kk_dev_config_map{
-	char * productCode;
-	kk_dev_config_item item;
-	struct kk_dev_config_map *next;
-}kk_dev_config_map;
 static kk_dev_config_map *dev_config_map = NULL;
 
 #define KK_DEVICE_CONFIG_MAP_TABLE_FILE_PREFIX			"./ZB/dev_config_table/device_%s.json"
@@ -449,6 +430,7 @@ kk_dev_config_item *kk_device_config_item_find_by_identity(kk_dev_config_map * m
 		if(!strcmp(item->identity,identity)){
 			return item;
 		}
+		item = item->next;
 	}
 	return NULL;
 }

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_manager.h

@@ -42,9 +42,29 @@ char *kk_match_productCode(const char* modelId);
 
 
 bool kk_device_config_map_add(const char *productCode);
+typedef int (*kk_rpc_set)(jrpc_context * ctx,EmberNodeId node,unsigned char ep,void* data);
+typedef int(*kk_rpc_report)(EmberEUI64 eui64,uint8_t EP,EmberAfClusterId clusterId,EmberAfAttributeId attributeId,uint8_t dataType,uint8_t len,uint8_t *data);
 
 
 
+typedef struct kk_dev_config_item{
+	char * identity;
+	char * reportFuncName;
+	char * controlFuncName;
+	kk_rpc_report * reportFunc;
+	kk_rpc_set * controlFunc;
+	uint8_t endpoint;
+	uint16_t cluster;
+	uint16_t attribute;
+	struct kk_dev_config_item * next;
+}kk_dev_config_item;
+
+
+typedef struct kk_dev_config_map{
+	char * productCode;
+	kk_dev_config_item item;
+	struct kk_dev_config_map *next;
+}kk_dev_config_map;
 
 
 

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_tsl_property_report.c

 #include "kk_tsl_property_report.h"
 #include "kk_tsl_zigbee_map.h"
+#include "kk_device_manager.h"
 
 const char *kk_tsl_rpt_status_string[] = {
 	"Success",
@@ -16,28 +17,35 @@ static int kk_tsl_report(EmberEUI64 mac,uint8_t EP,int status,uint16_t clusterId
 	char *Identify;
 	sub_dev_node_t *node = NULL;
 	kk_device_table_s *dev;
+	kk_dev_config_map *dev_info = NULL;
+	kk_dev_config_item *item = NULL;	
 	char macString[RPC_EUI64_STRING_LENGTH];
 	rpc_eui64ToString(mac,macString);
 
 	root = rpc_cJSON_CreateObject();
 	
-	index = kk_get_tsl_index(EP,clusterId,attributeId);
+	dev = kk_device_find_by_mac(mac);	
+	if(dev == NULL){
+		return tsl_rpt_err;
+	}
+	printf("[%s][%d]dev->productCode:%s\n",__FUNCTION__,__LINE__,dev->productCode);
+	dev_info = kk_device_config_find(dev->productCode);
+	if(dev_info == NULL){
+		return tsl_rpt_err;
+	}	
 
-	if(index < 0){
-		dev = kk_device_find_by_mac(mac);
-		if(dev!=NULL){
-			index = kk_get_tsl_glb_index(dev->productCode,EP,clusterId,attributeId);
-		}
-		
-		if(index < 0){
-			return tsl_rpt_err;
-		}else{
-			Identify = g_tsl_zigbee_map_glb[index].map.Identity;
+	item = &dev_info->item;
+	while(item!=NULL){
+		if(EP == item->endpoint &&
+			clusterId == item->cluster&&
+			attributeId == item->attribute){
+			Identify = item->identity;
+
+			break;
 		}
-	}else{
-		Identify = g_tsl_zigbee_map[index].Identity;
+		item = item->next;
 	}
-	
+
 	rpc_cJSON_AddNumberToObject(root, Identify,status);
 	kk_msg_report_property(root,mac);
 	return tsl_rpt_success;

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_zigbee_api.h

@@ -19,7 +19,7 @@ typedef struct{
 void kk_rpc_test(void);
 
 #define KK_RPC_SET_FUNCTION_TABLE	{\
-	{"zclOnOff_On",zclOnOff_On},\
+	{"zclOnOff",kk_tsl_set_gloabl_OnOff},\
 	{"zclOnOff_Off",zclOnOff_Off}\
 }
 

platform/zigbee/app/builder/Z3GatewayHost/kk_test.h

@@ -14,6 +14,7 @@
 #include "kk_device_table_db.h"
 
 
+
 #define KK_REPORT_DEVICE_JOINED_TYPE						"/thing/topo/add"
 #define KK_REPORT_DEVICE_LEFT_TYPE						"/thing/topo/delete"
 #define KK_REPORT_ATTRIBUTE_TYPE						    "/thing/event/property/post"