Merge branch 'hzl' into 'master'

【修改内容】1. 去掉重复定义

See merge request chenweican/k-sdk!16

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

@@ -177,7 +177,7 @@ void kk_device_joined(EmberNodeId node)
 	
 	UTIL_LOG_INFO("\n********************kk device joined********************\n");
 	
-	if(emberAfDeviceTableGetEui64FromNodeId(node,mac)==false){
+	if(emberAfDeviceTableGetEui64FromNodeId(node,mac)){
 		deviceTableIndex = emberAfDeviceTableGetIndexFromNodeId(node);
 		if(deviceTableIndex!=0xffff){
 			devPtr = emberAfDeviceTablePointer();

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

@@ -201,7 +201,7 @@ void emberAfMainTickCallback(void)
 	static unsigned int last_time;
 	unsigned int time = halCommonGetInt32uMillisecondTick();
 
-	if((time-last_time)>=500){
+	if((time - last_time)>=3000){
 		last_time = time;
 		kk_productCode_tick();
 		//printf("kk_productCode_tick!\n");

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

@@ -29,7 +29,6 @@
 #define ZIGBEE_COO_PRODUCT_CODE "2"
 
 #define TEST_PRODUCT_CODE "24"
-#define GW2CCU_PROTOCOL "tcp"
 
 #define MSG_TOPO_CHANGE_TYPE_STR  "changeType"
 #define MSG_TOPO_CHANGE_DEVICES_STR  "devices"
@@ -41,13 +40,6 @@ int kk_zcl_onoff_set(jrpc_context * ctx,const char *mac,unsigned char ep,void* d
 
 									
 
-
-
-int kk_sendData2CCU(char* data, int len);
-
-
-									
-
 #define RPC_KK_TEST_FUNCTION_TABLE	\
 	{(rpc_function*)kk_tsl_property_operation,"/thing/service/property/set"},\
 	{(rpc_function*)kk_tsl_property_operation,KK_READ_ATTRIBUTE_METHOD},\

platform/zigbee/protocol/zigbee/tool/random/random-linux.c

@@ -25,7 +25,7 @@
 // Our strategy is print out the source for the randomness and hope security
 // conscious users will verify this on their own systems.
 
-static const char randomDevice[] = "/dev/random";
+static const char randomDevice[] = "/dev/urandom";//"/dev/random";
 
 //==============================================================================
 // Funtions