Skip to content

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

add api.h

parent a706052d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 930 additions and 743 deletions
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_manager.c
View file @ f4929f7d
...@@ -375,6 +375,21 @@ void emberAfPluginDeviceTableNewDeviceCallback(EmberEUI64 nodeEui64) ...@@ -375,6 +375,21 @@ void emberAfPluginDeviceTableNewDeviceCallback(EmberEUI64 nodeEui64)
{ {
kk_device_joined(emberAfDeviceTableGetNodeIdFromEui64(nodeEui64)); kk_device_joined(emberAfDeviceTableGetNodeIdFromEui64(nodeEui64));
} }
void emberAfPluginDeviceTableDeviceLeftCallback(EmberEUI64 nodeEui64)
{
uint16_t deviceTableIndex = emberAfDeviceTableGetFirstIndexFromEui64(nodeEui64);
if(deviceTableIndex == EMBER_AF_PLUGIN_DEVICE_TABLE_NULL_INDEX){
return ;
}
EmberAfPluginDeviceTableEntry *deviceTable = emberAfDeviceTablePointer();
cJSON* nodeJson = rpc_reportDeviceState("left",deviceTable[deviceTableIndex].eui64);
rpc_printfJSON("left",nodeJson);
kk_rpc_reportLeftDevices(deviceTable[deviceTableIndex].eui64);
}
void kk_device_joined(EmberNodeId node) void kk_device_joined(EmberNodeId node)
{ {
......
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_zigbee_api.c 0 → 100644
View file @ f4929f7d
This diff is collapsed.
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_zigbee_api.h 0 → 100644
View file @ f4929f7d
#ifndef __KK_ZIGBEE_API_H
#define __KK_ZIGBEE_API_H
#include "kk_test.h"
EmberStatus kk_network_form(bool centralized,EmberPanId panId,int8_t radioTxPower,uint8_t channel);
void kk_print_network_info(void);
EmberStatus zclGRead(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
bool svr);
EmberStatus zclGWrite(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
uint8_t dataType,
uint8_t dataLen,
uint8_t *data,
bool svr);
EmberStatus zclOnOff_On(uint16_t node,uint8_t ep);
EmberStatus zclOnOff_Off(uint16_t node,uint8_t ep);
EmberStatus zclOnOff_Toggle(uint16_t node,uint8_t ep);
EmberStatus zclOnOff_OffWithEffect(uint16_t node,uint8_t ep,uint8_t id,uint8_t var);
EmberStatus zclOnOff_OnWithRecallGlobalScene(uint16_t node,uint8_t ep);
EmberStatus zclOnOff_OnWithTimedOff(uint16_t node,uint8_t ep,uint8_t Control,uint16_t OnTime,uint16_t OffWaitTime);
EmberStatus WindowCover_UpOpen(uint16_t node,uint8_t ep);
EmberStatus WindowCover_DownClose(uint16_t node,uint8_t ep);
EmberStatus WindowCover_Stop(uint16_t node,uint8_t ep);
EmberStatus WindowCover_GotoLiftPercentage(uint16_t node,uint8_t ep,uint8_t position);
EmberStatus zclColorControlMovetohue(uint16_t node,
uint8_t ep,
uint8_t hue,
uint8_t dir,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovehue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStephue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t size,
uint8_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetosat(uint16_t node,
uint8_t ep,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovesat(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepsat(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t size,
uint8_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetohueandsat(uint16_t node,
uint8_t ep,
uint8_t hue,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetocolor(uint16_t node,
uint8_t ep,
uint16_t colorX,
uint16_t colorY,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovecolor(uint16_t node,
uint8_t ep,
uint16_t rateX,
uint16_t rateY,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepcolor(uint16_t node,
uint8_t ep,
uint16_t stepX,
uint16_t stepY,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetocolortemp(uint16_t node,
uint8_t ep,
uint16_t colorTemp,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovetohue(uint16_t node,
uint8_t ep,
uint16_t hue,
uint8_t dir,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovehue( uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEstephue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t size,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovetohueandsat(uint16_t node,
uint8_t ep,
uint16_t hue,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlLoopSet(uint16_t node,
uint8_t ep,
uint8_t flags,
uint8_t action,
uint8_t dir,
uint16_t time,
uint16_t sHue,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStopmovestep(uint16_t node,
uint8_t ep,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovecolortemp(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t rate,
uint16_t Tmin,
uint16_t Tmax,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepcolortemp(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t size,
uint16_t trsTime,
uint16_t minimum,
uint16_t maximum,
bool options,
uint8_t mask,
uint8_t Override);
#endif
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/inc/rpc_colorControl.h
View file @ f4929f7d
...@@ -2,158 +2,7 @@ ...@@ -2,158 +2,7 @@
#define __RPC_COLOR_CONTROL_H #define __RPC_COLOR_CONTROL_H
#include "RPC_API.h" #include "RPC_API.h"
EmberStatus zclColorControlMovetohue(uint16_t node,
uint8_t ep,
uint8_t hue,
uint8_t dir,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovehue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStephue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t size,
uint8_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetosat(uint16_t node,
uint8_t ep,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovesat(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepsat(uint16_t node,
uint8_t ep,
uint8_t mode,
uint8_t size,
uint8_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetohueandsat(uint16_t node,
uint8_t ep,
uint8_t hue,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetocolor(uint16_t node,
uint8_t ep,
uint16_t colorX,
uint16_t colorY,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovecolor(uint16_t node,
uint8_t ep,
uint16_t rateX,
uint16_t rateY,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepcolor(uint16_t node,
uint8_t ep,
uint16_t stepX,
uint16_t stepY,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovetocolortemp(uint16_t node,
uint8_t ep,
uint16_t colorTemp,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovetohue(uint16_t node,
uint8_t ep,
uint16_t hue,
uint8_t dir,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovehue( uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t rate,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEstephue(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t size,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlEmovetohueandsat(uint16_t node,
uint8_t ep,
uint16_t hue,
uint8_t saturation,
uint16_t trsTime,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlLoopSet(uint16_t node,
uint8_t ep,
uint8_t flags,
uint8_t action,
uint8_t dir,
uint16_t time,
uint16_t sHue,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStopmovestep(uint16_t node,
uint8_t ep,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlMovecolortemp(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t rate,
uint16_t Tmin,
uint16_t Tmax,
bool options,
uint8_t mask,
uint8_t Override);
EmberStatus zclColorControlStepcolortemp(uint16_t node,
uint8_t ep,
uint8_t mode,
uint16_t size,
uint16_t trsTime,
uint16_t minimum,
uint16_t maximum,
bool options,
uint8_t mask,
uint8_t Override);
cJSON *rpc_zclColorControlMovetohue(jrpc_context * ctx, cJSON * params, cJSON *id); cJSON *rpc_zclColorControlMovetohue(jrpc_context * ctx, cJSON * params, cJSON *id);
......
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/inc/rpc_global_cmd.h
View file @ f4929f7d
...@@ -5,23 +5,7 @@ ...@@ -5,23 +5,7 @@
EmberStatus zclGRead(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
bool svr);
EmberStatus zclGWrite(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
uint8_t dataType,
uint8_t dataLen,
uint8_t *data,
bool svr);
cJSON *rpc_zclGRead(jrpc_context * ctx, cJSON * params, cJSON *id); cJSON *rpc_zclGRead(jrpc_context * ctx, cJSON * params, cJSON *id);
......
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_global_cmd.c
View file @ f4929f7d
...@@ -49,62 +49,6 @@ void emAfCliSendCommand(uint16_t destination,uint8_t srcEndpoint,uint8_t dstEndp ...@@ -49,62 +49,6 @@ void emAfCliSendCommand(uint16_t destination,uint8_t srcEndpoint,uint8_t dstEndp
EmberStatus zclGRead(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
bool svr)
{
EmberStatus status;
zclBufferSetup(ZCL_GLOBAL_COMMAND | ((svr==true)?
ZCL_FRAME_CONTROL_CLIENT_TO_SERVER
:ZCL_FRAME_CONTROL_SERVER_TO_CLIENT),
clusterId,
ZCL_READ_ATTRIBUTES_COMMAND_ID);
zclBufferAddByte(LOW_BYTE(attrId));
zclBufferAddByte(HIGH_BYTE(attrId));
rpcBufferPrint();
status = rpcSendCommand(node,srcEP,dstEP,multicast);
return status;
}
EmberStatus zclGWrite(uint16_t node,
uint8_t srcEP,
uint8_t dstEP,
bool multicast,
uint16_t clusterId,
uint16_t attrId,
uint8_t dataType,
uint8_t dataLen,
uint8_t *data,
bool svr)
{
EmberStatus status = EMBER_ERR_FATAL;
int i;
if(data==NULL||dataLen==0) return status;
zclBufferSetup(ZCL_GLOBAL_COMMAND | ((svr==true)?
ZCL_FRAME_CONTROL_CLIENT_TO_SERVER
:ZCL_FRAME_CONTROL_SERVER_TO_CLIENT),
clusterId,
ZCL_WRITE_ATTRIBUTES_COMMAND_ID);
zclBufferAddByte(LOW_BYTE(attrId));
zclBufferAddByte(HIGH_BYTE(attrId));
zclBufferAddByte(dataType);
for(i=0;i<dataLen;i++){
zclBufferAddByte(data[i]);
}
rpcBufferPrint();
status = rpcSendCommand(node,srcEP,dstEP,multicast);
return status;
}
......
platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c
View file @ f4929f7d
...@@ -349,7 +349,6 @@ int search_ccu(char devcode[33], char ip[16], int* port){ ...@@ -349,7 +349,6 @@ int search_ccu(char devcode[33], char ip[16], int* port){
return -1; return -1;
} }
printf("[%s] start search ccu!! \n", __FUNCTION__);
while (1) while (1)
{ {
if ((iSendbytes = sendto(sock, sendMessage, strlen(sendMessage)+1, 0, (struct sockaddr*)&Addrto, sizeof(struct sockaddr))) == -1) if ((iSendbytes = sendto(sock, sendMessage, strlen(sendMessage)+1, 0, (struct sockaddr*)&Addrto, sizeof(struct sockaddr))) == -1)
...@@ -457,6 +456,7 @@ void* _msg_event_property_post(char ip[16], int port){ ...@@ -457,6 +456,7 @@ void* _msg_event_property_post(char ip[16], int port){
} }
void ipcHandle(void) void ipcHandle(void)
{ {
char deviceCode[33] = {0}; char deviceCode[33] = {0};
...@@ -477,8 +477,6 @@ void ipcHandle(void) ...@@ -477,8 +477,6 @@ void ipcHandle(void)
jrpc_register_procedure(&my_server, rpc_table[i].func, rpc_table[i].name, NULL ); jrpc_register_procedure(&my_server, rpc_table[i].func, rpc_table[i].name, NULL );
} }
//send add gw to ccu //send add gw to ccu
char* outbuf = _msg_topo_add(); char* outbuf = _msg_topo_add();
if (strcmp(GW2CCU_PROTOCOL, "tcp") != 0){ if (strcmp(GW2CCU_PROTOCOL, "tcp") != 0){
...@@ -500,31 +498,10 @@ void ipcHandle(void) ...@@ -500,31 +498,10 @@ void ipcHandle(void)
free(postmsg); free(postmsg);
} }
if (kk_get_retry_num() > 20){
//discover ccu
search_ccu(deviceCode, ip, &port);
if(strcmp(GW2CCU_PROTOCOL, "tcp") == 0){
kk_tcp_client_init(ip, port, _cb);
}else{
//kk_ipc_init(IPC_PLAT2MID, _cb, macString/*GW_DEVICE_CODE*/, ip);
}
//send add gw to ccu
outbuf = _msg_topo_add();
if (outbuf == NULL){
printf("[%s] topo add msg failed, exit\n",__FUNCTION__);
return;
} }
kk_sendData2CCU(outbuf, strlen(outbuf)); //jrpc_server_run(&my_server);
free(outbuf); //jrpc_server_destroy(&my_server);
cnt = 0;
kk_reset_retry_num();
}
}
} }
...@@ -821,21 +798,7 @@ void emberAfPluginDeviceTableStateChangeCallback(EmberNodeId nodeId, ...@@ -821,21 +798,7 @@ void emberAfPluginDeviceTableStateChangeCallback(EmberNodeId nodeId,
void emberAfPluginDeviceTableDeviceLeftCallback(EmberEUI64 nodeEui64)
{
uint16_t deviceTableIndex = emberAfDeviceTableGetFirstIndexFromEui64(nodeEui64);
if(deviceTableIndex == EMBER_AF_PLUGIN_DEVICE_TABLE_NULL_INDEX){
return ;
}
EmberAfPluginDeviceTableEntry *deviceTable = emberAfDeviceTablePointer();
cJSON* nodeJson = rpc_reportDeviceState("left",deviceTable[deviceTableIndex].eui64);
rpc_printfJSON("left",nodeJson);
//rpc_send_message(nodeJson,"device left");
kk_rpc_reportLeftDevices(deviceTable[deviceTableIndex].eui64);
}
static cJSON* rpc_buildDeviceEndpoint(EmberEUI64 eui64, uint8_t endpoint) static cJSON* rpc_buildDeviceEndpoint(EmberEUI64 eui64, uint8_t endpoint)
{ {
......
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