Commit c8a0e75a authored by 陈伟灿's avatar 陈伟灿

Merge branch 'yjq' into 'master'

Yjq

See merge request chenweican/k-sdk!8
parents a84179ef c995f942
{
"productCode":"3073",
"config":[
{
"identity":"PowerSwitch_1",
"endpoint":1,
"cluster":"0x0006",
"attribute":"0x0000",
"reportFunc":"kk_tsl_report_global_onoff",
"controlFunc":"zclOnOff"
},{
"identity":"RGBColor.red",
"endpoint":1,
"cluster":"",
"attribute":"",
"reportFunc":"",
"controlFunc":"xxx"
},{
"identity":"RGBColor.green",
"endpoint":1,
"cluster":"",
"attribute":"",
"reportFunc":"",
"controlFunc":"xxx"
},{
"identity":"RGBColor.blue",
"endpoint":1,
"cluster":"",
"attribute":"",
"reportFunc":"",
"controlFunc":"xxx"
},{
"identity":"CurrentHue",
"endpoint":1,
"cluster":"0x0300",
"attribute":"0x0000",
"reportFunc":"kk_tsl_report_global_onoff",
"controlFunc":""
},{
"identity":"CurrentSaturation",
"endpoint":1,
"cluster":"0x0300",
"attribute":"0x0001",
"reportFunc":"kk_tsl_report_global_onoff",
"controlFunc":""
},{
"identity":"Brightness",
"endpoint":1,
"cluster":"0x0008",
"attribute":"0x0000",
"reportFunc":"kk_tsl_report_colorControl_Brightness",
"controlFunc":"kk_tsl_set_colorlight_Brightness"
},{
"identity":"WhiteBrightness",
"endpoint":2,
"cluster":"0x0008",
"attribute":"0x0000",
"reportFunc":"kk_tsl_report_colorControl_WhiteBrightness",
"controlFunc":"kk_tsl_set_colorlight_WhiteBrightness"
},{
"identity":"Mode",
"endpoint":1,
"cluster":"0xFCC0",
"attribute":"0x0000",
"reportFunc":"kk_tsl_report_colorControl_mode",
"controlFunc":"kk_tsl_set_colorlight_mode"
}
]
}
\ No newline at end of file
......@@ -208,11 +208,10 @@ void emberAfMainTickCallback(void)
static unsigned int last_time;
unsigned int time = halCommonGetInt32uMillisecondTick();
if((time-last_time)>=1000){
if((time-last_time)>=500){
last_time = time;
kk_productCode_tick();
//printf("kk_productCode_tick!\n");
}
}
......
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