Skip to content

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

Merge branch 'cwc' into 'master' 

【修改内容】增加传感类设备防撬报警的event支持

See merge request chenweican/k-sdk!40
parents f3acacd8 547a56cf
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 46 deletions
midware/midware/midware.c
View file @ a469a7c6
......@@ -375,6 +375,7 @@ void kk_platMsg_handle(void* data, char* chalMark){
int idx = 0;
kk_tsl_event_t *eventItem =NULL;
char tmpStr[128] = {0};
cJSON * itemStr = NULL;
res = dm_mgr_get_device_shadow_by_devicecode(info_dcode->valuestring,&dev_shadow);
if (res < SUCCESS_RETURN) {
goto error;
......@@ -386,7 +387,7 @@ void kk_platMsg_handle(void* data, char* chalMark){
eventItem->output_data_number > 0){
int index = 0;
kk_tsl_data_t *itemData = NULL;
cJSON * itemStr = NULL;
for(index = 0; index < eventItem->output_data_number;index++){
itemStr = cJSON_GetObjectItem(jsonPay, eventItem->identifier);
itemData = eventItem->output_datas + index;
......@@ -413,6 +414,15 @@ void kk_platMsg_handle(void* data, char* chalMark){
}
}
else if(strcmp(eventItem->identifier,MSG_PROPERTY_STR) != 0 &&
eventItem->output_data_number == 0){
itemStr = cJSON_GetObjectItem(jsonPay, eventItem->identifier);
if(itemStr != NULL){
//kk_tsl_set_value(kk_tsl_set_event_output_value,dev_shadow,eventItem->identifier,&itemStr->valueint,NULL);
dm_msg_thing_event_post(info_dcode->valuestring,eventItem->identifier);
}
}
}
}
}else if(strstr(msgType->valuestring, KK_THING_TOPO_BATCH_DELETE_MSG) != NULL){
......
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1008.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1012.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1015.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1023.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1024.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_1035.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_135.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_140.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_141.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_26.json
View file @ a469a7c6
......@@ -26,13 +26,21 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
}
]
}
platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_config_table/device_27.json
View file @ a469a7c6
......@@ -26,14 +26,22 @@
"reportFunc":"",
"controlFunc":""
},{
"identity":"batteryAlarm",
"identity":"BatteryAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0008",
"reportFunc":"",
"controlFunc":""
}
},{
"identity":"TamperAlarm",
"endpoint":1,
"cluster":"0x0500",
"attribute":"0x0002",
"iasStatusMask":"0x0004",
"reportFunc":"",
"controlFunc":""
},
]
}
\ No newline at end of file
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c
View file @ a469a7c6
......@@ -535,11 +535,6 @@ void emberAfPluginDeviceTableInitialized(void)
kk_load_dev_map_table();
kk_device_map_print();
kk_device_config_load_from_db();
//kk_device_config_map_add("3073");
}
void test_123(int val)
......
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_tsl_property_report.c
View file @ a469a7c6
......@@ -115,7 +115,7 @@ static int kk_tsl_report(EmberEUI64 mac,uint8_t EP,int status,uint16_t clusterId
if(clusterId==ZCL_BASIC_CLUSTER_ID && attributeId== ZCL_BATTERY_PERCENTAGE_REMAINING_ATTRIBUTE_ID){
double battery = (double)status * 0.5;
char batteryStr[32];
sprintf(batteryStr,"f",battery);
sprintf(batteryStr,"%f",battery);
rpc_cJSON_AddStringToObject(root, Identify,batteryStr);
}else{
rpc_cJSON_AddNumberToObject(root, Identify,status);
......@@ -144,30 +144,26 @@ void kk_tsl_report_alarm(EmberEUI64 eui64,
UTIL_LOG_INFO("\n********************kk_tsl_report_alarm********************\n");
dev = kk_device_find_by_mac(eui64);
if(dev == NULL){
printf("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
return;
}
dev_info = kk_device_config_find(dev->productCode);
if(dev_info == NULL){
printf("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&,%s\n",dev->productCode);
return;
}
item = &dev_info->item;
while(item!=NULL){
printf("&&&&&&&&&&&&&&&&&&&&&&\n");
if(item->cluster== ZCL_IAS_ZONE_CLUSTER_ID
&& item->attribute ==ZCL_ZONE_STATUS_ATTRIBUTE_ID &&
item->iasZoneStatusMask!=0 && item->reportFunc==NULL){
printf("!!!!!!!!!!!!\n");
root = rpc_cJSON_CreateObject();
rpc_cJSON_AddNumberToObject(root, item->identity,(zoneStatus & item->iasZoneStatusMask) ? 1 : 0);
kk_msg_report_alarm(root,eui64);
}
item = item->next;
printf("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
}
}
......
tsl/product_1008.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_1012.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_1015.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_1023.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_1024.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_1035.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_135.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_140.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_141.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_2102.json
View file @ a469a7c6
{
"schema":"https://ikonke.com/schema.json",
"schema": "https://iot-ap.ikonke.com/model/product_2102.json",
"productType":"outlet",
"profile":{
"heartbeat": "3000",
"productCode": "2102",
"productName": "星辰二路零火面板"
},
......
tsl/product_26.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ No newline at end of file
tsl/product_27.json
View file @ a469a7c6
......@@ -131,11 +131,18 @@
}
}
}],
"identifier": "batteryAlarm",
"identifier": "BatteryAlarm",
"method": "thing.event.alarm.post",
"name": "batteryAlarm",
"name": "BatteryAlarm",
"type": "alarm",
"required": true,
"desc": "低电量告警"
}, {
"identifier": "TamperAlarm",
"name": "防撬报警",
"type": "alert",
"required": true,
"method": "thing.event.TamperAlarm.post",
"outputData": []
}]
}
\ 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