Merge branch 'cwc' into 'master'

【修改内容】增加地暖多合一面板的支持

See merge request chenweican/k-sdk!143

application/klansdk/kk_data_mng.h

@@ -44,6 +44,6 @@ void _kk_map_dev_mutex_unlock(void);
 void kk_map_dev_deinit(void);
 int kk_creater_nodeid(char *deviceCode,int channel,char *nodeId);
 #define AIR_FRESH_MUTI_DEVICE "3099"
-
+#define HEATING_FRESH_MUTI_DEVICE "3097"
 
 #endif

application/klansdk/kk_lan_sync.c

@@ -622,6 +622,8 @@ static int _kk_sync_devices_status_arg_obj(kk_map_dev_node_t *node,cJSON *devSta
 	//新风多合一面板需要获取第三路状态
 	if(strcmp(node->productCode,AIR_FRESH_MUTI_DEVICE) == 0){
 		kk_creater_nodeid(node->deviceCode,3,nodeid);
+	}else if(strcmp(node->productCode,HEATING_FRESH_MUTI_DEVICE) == 0){////地暖多合一面板需要获取第三路状态
+		kk_creater_nodeid(node->deviceCode,2,nodeid);
 	}else{
 		kk_creater_nodeid(node->deviceCode,ch,nodeid);
 	}

application/klansdk/kk_oldccu_msg.c

@@ -215,6 +215,11 @@ static int _kk_lan_sync_device_status(const char *deviceCode,kk_map_dev_node_t *
 			debug_log(LOG_DEBUG_LEVEL,"[err] nodeId.\n");
 			return -1;
 		} 
+	}else if(strcmp(devNode->productCode,HEATING_FRESH_MUTI_DEVICE) == 0){
+		if((nodeId = kk_lan_db_node_get(deviceCode,2))==-1){
+			debug_log(LOG_DEBUG_LEVEL,"[err] nodeId.\n");
+			return -1;
+		} 
 	}else{
 		if((nodeId = kk_lan_db_node_get(deviceCode,ch))==-1){
 			debug_log(LOG_DEBUG_LEVEL,"[err] nodeId.\n");

midware/midware/midware.c

@@ -339,8 +339,7 @@ static int kk_property_set_data_check(cJSON * payload,const char *deviceCode){
 								cJSON_AddItemToObject(params,property->identifier,propertyItem);
 								cJSON_DeleteItemFromObject(params, propertiesbuf[0]);
 							}
-							else if(property->data_value.type == KK_TSL_DATA_TYPE_INT ||property->data_value.type == KK_TSL_DATA_TYPE_FLOAT \
-								|| property->data_value.type == KK_TSL_DATA_TYPE_DOUBLE){
+							else if(property->data_value.type == KK_TSL_DATA_TYPE_INT){
 								value = propertyItem->valueint;
 								if(value < property->data_value.mix ||value > property->data_value.max ){
 									ERROR_PRINT("ERROR !!!value:%d,mix:%d,max:%d\n",value,property->data_value.mix,property->data_value.max);
@@ -350,6 +349,16 @@ static int kk_property_set_data_check(cJSON * payload,const char *deviceCode){
 								cJSON_AddNumberToObject(params,property->identifier,propertyItem->valueint);
 								cJSON_DeleteItemFromObject(params, propertiesbuf[0]);
 							}
+							else if(property->data_value.type == KK_TSL_DATA_TYPE_FLOAT || property->data_value.type == KK_TSL_DATA_TYPE_DOUBLE){
+								value = propertyItem->valuedouble;
+								if(value < property->data_value.mix ||value > property->data_value.max ){
+									ERROR_PRINT("ERROR !!!value:%d,mix:%d,max:%d\n",value,property->data_value.mix,property->data_value.max);
+									return INVALID_PARAMETER;
+								}
+								INFO_PRINT("-----------------KK_TSL_DATA_TYPE_DOUBLE-------------------\n");
+								cJSON_AddNumberToObject(params,property->identifier,propertyItem->valuedouble);
+								cJSON_DeleteItemFromObject(params, propertiesbuf[0]);
+							}
 							else if(property->data_value.type == KK_TSL_DATA_TYPE_TEXT){
 								if(strlen(propertyItem->valuestring) > property->data_value.length ){
 									ERROR_PRINT("ERROR !!!strlen(propertyItem->valuestring):%d,property->data_value.length:%d\n",strlen(propertyItem->valuestring),property->data_value.length );

opcodeMapCfg/device_3094.json

+{
+	"productCode":"3094",
+	"operateType":"512",
+	"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_3097.json

+{
+	"productCode":"3097",
+	"operateType":"12501",
+	"channel":3,
+	"syn_type":1,
+	"syn_opcode":"FLOOR_HEATING_DEV_STATUS",
+	"newccu":[
+		{
+			"identifier":"PowerSwitch",
+			"opcodemap":"SWITCH",
+			"dataType":"int",
+			"channel":"2",
+			"valueRange":[0,1],
+			"value": 0
+		},{
+			"identifier":"WorkMode",
+			"opcodemap":"SET_WORK_MODEL",
+			"dataType":"int",
+			"channel":"2",
+			"valueRange":[0,1],
+			"value": 1
+		},{
+			"identifier":"Temperature",
+			"opcodemap":"SET_WORK_TEMPERATURE",
+			"dataType":"double",
+			"channel":"2",
+			"valueRange":[],
+			"value": 16
+		},{
+			"identifier":"TimingOffTime",
+			"opcodemap":"FLOOR_HEATING_SET_TIME_OFF",
+			"dataType":"string_time",
+			"channel":"2",
+			"valueRange":[],
+			"value": 0
+		},{
+			"identifier":"ChildLockState",
+			"opcodemap":"FLOOR_HEATING_SET_LOCK_STATUS",
+			"dataType":"int",
+			"channel":"2",
+			"valueRange":[0,1],
+			"value": 0
+		},{
+			"identifier":"CurrentTemperature",
+			"opcodemap":"current_real_temperature",
+			"dataType":"double",
+			"channel":"2",
+			"valueRange":[],
+			"value": 22
+		}
+	],
+	"oldccu":[
+		{
+			"opcode":"SWITCH",
+			"identifiermap":"PowerSwitch",
+			"dataType":"map",
+			"channel":"2",
+			"valueRange":["OFF","ON"],
+			"syn":"on",
+			"synType":"bool"
+		},{
+			"opcode":"SET_WORK_MODEL",
+			"identifiermap":"WorkMode",
+			"dataType":"map",
+			"channel":"2",
+			"valueRange":["AUTO","MANUAL"],
+			"syn":"run_model",
+			"synType":"map"
+		},{
+			"opcode":"SET_WORK_TEMPERATURE",
+			"identifiermap":"Temperature",
+			"dataType":"string_double",
+			"channel":"2",
+			"valueRange":[],
+			"syn":"work_temperature",
+			"synType":"double"
+		},{
+			"opcode":"FLOOR_HEATING_SET_TIME_OFF",
+			"identifiermap":"TimingOffTime",
+			"dataType":"fit",
+			"channel":"2",
+			"valueRange":[],
+			"syn":"time_off",
+			"synType":"fit"
+		},{
+			"opcode":"FLOOR_HEATING_SET_LOCK_STATUS",
+			"identifiermap":"ChildLockState",
+			"dataType":"double",
+			"channel":"2",
+			"valueRange":[],
+			"syn":"",
+			"synType":"dummy"
+		},{
+			"opcode":"current_real_temperature",
+			"identifiermap":"CurrentTemperature",
+			"dataType":"double",
+			"channel":"2",
+			"valueRange":[],
+			"syn":"current_real_temperature",
+			"synType":"double"
+		}
+	]
+
+	
+}	
+	
+	
+	
+