Skip to content

K
k-sdk
Commit 717a02b9 authored by 陈伟灿's avatar 陈伟灿
Browse files
Options

Merge branch 'cwc' into 'master' 

【修改内容】增加相关局域网配置

See merge request chenweican/k-sdk!136
parents d4c4ca26 83607204
Show whitespace changes
Inline Side-by-side
Showing with 572 additions and 15 deletions
application/klansdk/kk_data_handle.c
View file @ 717a02b9
...@@ -415,7 +415,6 @@ static int kk_parse_syncinfo(cJSON *payload) ...@@ -415,7 +415,6 @@ static int kk_parse_syncinfo(cJSON *payload)
gwdevicecode = cJSON_GetObjectItem(gwitem,MSG_DEVICE_CODE_STR)->valuestring; gwdevicecode = cJSON_GetObjectItem(gwitem,MSG_DEVICE_CODE_STR)->valuestring;
if(subdevices != NULL){ if(subdevices != NULL){
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
subitem = subdevices->child; subitem = subdevices->child;
......
application/klansdk/kk_lan_ctrl.c
View file @ 717a02b9
...@@ -349,7 +349,6 @@ int kk_ccu_opcode_handle(cJSON *root) ...@@ -349,7 +349,6 @@ int kk_ccu_opcode_handle(cJSON *root)
} }
if(kk_map_dev_search_by_deviceCode(deviceCode, &dev)==0){ if(kk_map_dev_search_by_deviceCode(deviceCode, &dev)==0){
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_lan_ctrl_ack(nodeId,opcode,arg); kk_lan_ctrl_ack(nodeId,opcode,arg);
cJSON *params=kk_control_protocol_convert(dev,atoi(nodeId->valuestring),arg,opcode); cJSON *params=kk_control_protocol_convert(dev,atoi(nodeId->valuestring),arg,opcode);
......
midware/midware/dm/kk_dm_api.c
View file @ 717a02b9
...@@ -385,12 +385,12 @@ void kk_dm_ota_send(void *data, int len){ ...@@ -385,12 +385,12 @@ void kk_dm_ota_send(void *data, int len){
if (data != NULL){ if (data != NULL){
void* buf = malloc(len); void* buf = malloc(len);
memcpy(buf, data, len); memcpy(buf, data, len);
printf("------------------------------1\n");
int res = dm_queue_msg_insert3((void *)buf); int res = dm_queue_msg_insert3((void *)buf);
if (res != SUCCESS_RETURN) { if (res != SUCCESS_RETURN) {
free(buf); free(buf);
return ; return ;
} }
} }
} }
......
midware/midware/dm/kk_dm_queue.c
View file @ 717a02b9
...@@ -356,7 +356,7 @@ int dm_queue_msg_insert3(void *data) ...@@ -356,7 +356,7 @@ int dm_queue_msg_insert3(void *data)
INIT_LIST_HEAD(&node->linked_list); INIT_LIST_HEAD(&node->linked_list);
ctx->msg_list3.size++; ctx->msg_list3.size++;
list_add_tail(&node->linked_list, &ctx->msg_list3.message_list); list_add_tail(&node->linked_list, &ctx->msg_list3.message_list);
printf("------------------------------2\n");
_dm_queue_unlock3(); _dm_queue_unlock3();
return SUCCESS_RETURN; return SUCCESS_RETURN;
} }
...@@ -383,7 +383,7 @@ int dm_queue_msg_next3(void **data) ...@@ -383,7 +383,7 @@ int dm_queue_msg_next3(void **data)
*data = node->data; *data = node->data;
free(node); free(node);
printf("------------------------------3\n");
_dm_queue_unlock3(); _dm_queue_unlock3();
return SUCCESS_RETURN; return SUCCESS_RETURN;
} }
......
midware/midware/dm/kk_sync_data.c
View file @ 717a02b9
...@@ -1204,7 +1204,7 @@ char *kk_sync_get_info() ...@@ -1204,7 +1204,7 @@ char *kk_sync_get_info()
kk_get_ccu_properties_info(data); kk_get_ccu_properties_info(data);
out=cJSON_Print(data); out=cJSON_Print(data);
printf("kk_sync_get_info:%s\n",out); INFO_PRINT("kk_sync_get_info:%s\n",out);
cJSON_Delete(data); cJSON_Delete(data);
//free(out); //free(out);
return out; return out;
......
midware/midware/scene/kk_scene_db.c
View file @ 717a02b9
...@@ -640,9 +640,6 @@ int kk_scene_insert_scene_action(const char* type,const char* deviceCode,int epN ...@@ -640,9 +640,6 @@ int kk_scene_insert_scene_action(const char* type,const char* deviceCode,int epN
char *sqlCmd = NULL; char *sqlCmd = NULL;
char *zErrMsg = 0; char *zErrMsg = 0;
printf("----->kk_scene_insert_scene_action\n"); printf("----->kk_scene_insert_scene_action\n");
printf("propertyValue----->%s\n",propertyValue);
const char *insertCmd = "insert into SceneActionInfo (type, deviceCode,epNum,propertyName,propertyValue,delay,sceneId,gwdeviceCode) \ const char *insertCmd = "insert into SceneActionInfo (type, deviceCode,epNum,propertyName,propertyValue,delay,sceneId,gwdeviceCode) \
values ('%s','%s','%d','%s','%s','%d','%s','%s');"; values ('%s','%s','%d','%s','%s','%d','%s','%s');";
......
opcodeMapCfg/device_3030.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3030",
"operateType":"12501",
"channel":1,
"syn_type":1,
"syn_opcode":"FLOOR_HEATING_DEV_STATUS",
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},{
"identifier":"WorkMode",
"opcodemap":"SET_WORK_MODEL",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 1
},{
"identifier":"Temperature",
"opcodemap":"SET_WORK_TEMPERATURE",
"dataType":"double",
"channel":"1",
"valueRange":[],
"value": 16
},{
"identifier":"TimingOffTime",
"opcodemap":"FLOOR_HEATING_SET_TIME_OFF",
"dataType":"string_time",
"channel":"1",
"valueRange":[],
"value": 0
},{
"identifier":"ChildLockState",
"opcodemap":"FLOOR_HEATING_SET_LOCK_STATUS",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},{
"identifier":"CurrentTemperature",
"opcodemap":"current_real_temperature",
"dataType":"double",
"channel":"1",
"valueRange":[],
"value": 22
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"],
"syn":"on",
"synType":"bool"
},{
"opcode":"SET_WORK_MODEL",
"identifiermap":"WorkMode",
"dataType":"map",
"channel":"1",
"valueRange":["AUTO","MANUAL"],
"syn":"run_model",
"synType":"map"
},{
"opcode":"SET_WORK_TEMPERATURE",
"identifiermap":"Temperature",
"dataType":"string_double",
"channel":"1",
"valueRange":[],
"syn":"work_temperature",
"synType":"double"
},{
"opcode":"FLOOR_HEATING_SET_TIME_OFF",
"identifiermap":"TimingOffTime",
"dataType":"fit",
"channel":"1",
"valueRange":[],
"syn":"time_off",
"synType":"fit"
},{
"opcode":"FLOOR_HEATING_SET_LOCK_STATUS",
"identifiermap":"ChildLockState",
"dataType":"double",
"channel":"1",
"valueRange":[],
"syn":"",
"synType":"dummy"
},{
"opcode":"current_real_temperature",
"identifiermap":"CurrentTemperature",
"dataType":"double",
"channel":"1",
"valueRange":[],
"syn":"current_real_temperature",
"synType":"double"
}
]
}
opcodeMapCfg/device_3087.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3087",
"operateType":"3",
"channel":3,
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"2",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"3",
"valueRange":[0,1],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"2",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"3",
"valueRange":["OFF","ON"]
}
]
}
\ No newline at end of file
opcodeMapCfg/device_3091.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3091",
"operateType":"501",
"channel":1,
"syn_type":1,
"syn_opcode":"DIMMABLE_LIGHT_STATUS",
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},{
"identifier":"Brightness",
"opcodemap":"ADJUST_LUMINANCE",
"dataType":"int",
"channel":"1",
"valueRange":[],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"],
"syn":"on",
"synType":"bool"
},{
"opcode":"ADJUST_LUMINANCE",
"identifiermap":"Brightness",
"dataType":"int",
"channel":"1",
"valueRange":[],
"syn":"bri",
"synType":"int"
}
]
}
\ No newline at end of file
opcodeMapCfg/device_3092.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3092",
"operateType":"501",
"channel":2,
"syn_type":1,
"syn_opcode":"DIMMABLE_LIGHT_STATUS",
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},{
"identifier":"Brightness",
"opcodemap":"ADJUST_LUMINANCE",
"dataType":"int",
"channel":"1",
"valueRange":[],
"value": 0
},{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"2",
"valueRange":[0,1],
"value": 0
},{
"identifier":"Brightness",
"opcodemap":"ADJUST_LUMINANCE",
"dataType":"int",
"channel":"2",
"valueRange":[],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"],
"syn":"on",
"synType":"bool"
},{
"opcode":"ADJUST_LUMINANCE",
"identifiermap":"Brightness",
"dataType":"int",
"channel":"1",
"valueRange":[],
"syn":"bri",
"synType":"int"
},{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"2",
"valueRange":["OFF","ON"],
"syn":"on",
"synType":"bool"
},{
"opcode":"ADJUST_LUMINANCE",
"identifiermap":"Brightness",
"dataType":"int",
"channel":"2",
"valueRange":[],
"syn":"bri",
"synType":"int"
}
]
}
\ No newline at end of file
opcodeMapCfg/device_3115.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3115",
"operateType":"3",
"channel":4,
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"2",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"3",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"4",
"valueRange":[0,1],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"2",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"3",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"4",
"valueRange":["OFF","ON"]
}
]
}
\ No newline at end of file
opcodeMapCfg/device_5004.json 0 → 100644
View file @ 717a02b9
{
"productCode":"3023",
"operateType":"3",
"channel":2,
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"2",
"valueRange":[0,1],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"2",
"valueRange":["OFF","ON"]
}
]
}
\ No newline at end of file
tsl/product_5004.json 0 → 100644
View file @ 717a02b9
{
"schema":"https://iot-ap.ikonke.com/model/product_5004.json",
"productType":"switch",
"version": "1.0",
"profile":{
"heartbeat":"300",
"productCode":"5004",
"productName":"虚拟继电器"
},
"services":[
{
"outputData":[
],
"identifier":"set",
"inputData":[
{
"identifier":"PowerSwitch_1",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
},
{
"identifier":"PowerSwitch_2",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
}
],
"method":"thing.service.property.set",
"name":"set",
"required":true,
"callType":"async",
"desc":"属性设置"
},
{
"outputData":[
{
"identifier":"PowerSwitch_1",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
},
{
"identifier":"PowerSwitch_2",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
}
],
"identifier":"get",
"inputData":[
"PowerSwitch_1",
"PowerSwitch_2"
],
"method":"thing.service.property.get",
"name":"get",
"required":true,
"callType":"async",
"desc":"属性获取"
},
{
"outputData":[
],
"identifier":"negativeProperty",
"inputData":[
"PowerSwitch_1",
"PowerSwitch_2"
],
"method":"thing.service.negativeProperty",
"name":"negativeProperty",
"required":true,
"callType":"async",
"desc":"属性值取反"
}
],
"properties":[
{
"identifier":"PowerSwitch_1",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关",
"accessMode":"rw",
"required":true
},
{
"identifier":"PowerSwitch_2",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关",
"accessMode":"rw",
"required":true
}
],
"events":[
{
"outputData":[
{
"identifier":"PowerSwitch_1",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
},
{
"identifier":"PowerSwitch_2",
"dataType":{
"specs":{
"0":"关闭",
"1":"打开"
},
"type":"bool"
},
"name":"电源开关"
}
],
"identifier":"property",
"method":"thing.event.property.post",
"name":"property",
"type":"info",
"required":true,
"desc":"属性上报"
}
]
}
\ No newline at end of file
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