Skip to content

K
k-sdk
Commit d3176669 authored by chen.weican's avatar chen.weican
Browse files
Options

【修改内容】1，增加美思和肖邦的单火灯控支持 

【提交人】陈伟灿
parent 83e2fb24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4356 additions and 2283 deletions
application/kcloud/kk_register.c
View file @ d3176669
......@@ -380,7 +380,8 @@ int kk_start_ccu_register(void)
if (h == 0)
{
INFO_PRINT("kk_register receive nothing\n");
continue;
close(sockfd);
return -1;
}
if (h < 0) {
close(sockfd);
......
application/klansdk/kk_lan_sync.c
View file @ d3176669
......@@ -713,7 +713,12 @@ cJSON *kk_sync_ccu_version_to_sdk(cJSON *root,cJSON *data)
{
//todo:同步CCU版本信息
cJSON *ccu_version = cJSON_CreateObject();
cJSON_AddStringToObject(ccu_version, "cur_ccu_version", "1.0.0");
cJSON *version = cJSON_GetObjectItem(data,"firmwareVersion");
if(version != NULL){
cJSON_AddStringToObject(ccu_version, "cur_ccu_version", version->valuestring);
}else{
cJSON_AddStringToObject(ccu_version, "cur_ccu_version", "1.0.0");
}
cJSON_AddStringToObject(ccu_version, "downloaded_ccu_version", "1.0.0");
cJSON_AddItemToObject(root, "ccu_version", ccu_version);
......
nx5_soc_gw/kk_device_def.json
View file @ d3176669
This diff is collapsed.
opcodeMapCfg/device_3091.json
View file @ d3176669
......@@ -19,6 +19,13 @@
"channel":"1",
"valueRange":[],
"value": 0
},{
"identifier":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"dataType":"int",
"channel":"1",
"valueRange":[],
"value": 0
}
],
"oldccu":[
......@@ -38,6 +45,14 @@
"valueRange":[],
"syn":"bri",
"synType":"int"
},{
"opcode":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"1",
"valueRange":[],
"syn":"colour_temperature",
"synType":"int"
}
]
......
opcodeMapCfg/device_3092.json
View file @ d3176669
......@@ -19,6 +19,13 @@
"channel":"1",
"valueRange":[],
"value": 0
},{
"identifier":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"dataType":"int",
"channel":"1",
"valueRange":[],
"value": 0
},{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
......@@ -33,6 +40,13 @@
"channel":"2",
"valueRange":[],
"value": 0
},{
"identifier":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"dataType":"int",
"channel":"2",
"valueRange":[],
"value": 0
}
],
"oldccu":[
......@@ -52,6 +66,14 @@
"valueRange":[],
"syn":"bri",
"synType":"int"
},{
"opcode":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"1",
"valueRange":[],
"syn":"colour_temperature",
"synType":"int"
},{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
......@@ -68,6 +90,14 @@
"valueRange":[],
"syn":"bri",
"synType":"int"
},{
"opcode":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"2",
"valueRange":[],
"syn":"colour_temperature",
"synType":"int"
}
]
......
opcodeMapCfg/device_3093.json 0 → 100644
View file @ d3176669
{
"productCode":"3093",
"operateType":"512",
"channel":3,
"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":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"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
},{
"identifier":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"dataType":"int",
"channel":"2",
"valueRange":[],
"value": 0
},{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"3",
"valueRange":[0,1],
"value": 0
},{
"identifier":"Brightness",
"opcodemap":"ADJUST_LUMINANCE",
"dataType":"int",
"channel":"3",
"valueRange":[],
"value": 0
},{
"identifier":"ColorTemperature",
"opcodemap":"ADJUST_COLOUR_TEMPERATURE",
"dataType":"int",
"channel":"3",
"valueRange":[],
],
"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":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"1",
"valueRange":[],
"syn":"colour_temperature",
"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"
},{
"opcode":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"2",
"valueRange":[],
"syn":"colour_temperature",
"synType":"int"
},{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"3",
"valueRange":["OFF","ON"],
"syn":"on",
"synType":"bool"
},{
"opcode":"ADJUST_LUMINANCE",
"identifiermap":"Brightness",
"dataType":"int",
"channel":"3",
"valueRange":[],
"syn":"bri",
"synType":"int"
},{
"opcode":"ADJUST_COLOUR_TEMPERATURE",
"identifiermap":"ColorTemperature",
"dataType":"int",
"channel":"3",
"valueRange":[],
"syn":"colour_temperature",
"synType":"int"
}
]
}
\ No newline at end of file
opcodeMapCfg/device_3129.json 0 → 100644
View file @ d3176669
{
"productCode":"3129",
"operateType":"3",
"channel":1,
"newccu":[
{
"identifier":"PowerSwitch",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch",
"dataType":"map",
"channel":"1",
"valueRange":["OFF","ON"]
}
]
}
\ No newline at end of file
opcodeMapCfg/device_3130.json 0 → 100644
View file @ d3176669
{
"productCode":"3130",
"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
opcodeMapCfg/device_3131.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3119.json
View file @ d3176669
This diff is collapsed.
tsl/product_3129.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3130.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3131.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3132.json
View file @ d3176669
This diff is collapsed.
tsl/product_3156.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3157.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3158.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3163.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3164.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/product_3185.json 0 → 100644
View file @ d3176669
This diff is collapsed.
tsl/version
View file @ d3176669
This diff is collapsed.
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