espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for int32 and int64 data types

Browse Source
This commit is contained in:
Rohit Jadhav
2022-09-02 16:02:53 +05:30
parent 01b0511d9e
commit 08f2f5de38
2 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute_utils.cpp
+78 -1
View File
@@ -119,7 +119,7 @@ esp_matter_attr_val_t esp_matter_uint16(uint16_t val)
return attr_val;
}
esp_matter_attr_val_t esp_matter_int32(int16_t val)
esp_matter_attr_val_t esp_matter_int32(int32_t val)
{
esp_matter_attr_val_t attr_val = {
.type = ESP_MATTER_VAL_TYPE_INT32,
@@ -141,6 +141,17 @@ esp_matter_attr_val_t esp_matter_uint32(uint32_t val)
return attr_val;
}
esp_matter_attr_val_t esp_matter_int64(int64_t val)
{
esp_matter_attr_val_t attr_val = {
.type = ESP_MATTER_VAL_TYPE_INT64,
.val = {
.i64 = val,
},
};
return attr_val;
}
esp_matter_attr_val_t esp_matter_uint64(uint64_t val)
{
esp_matter_attr_val_t attr_val = {
@@ -286,9 +297,15 @@ static esp_err_t console_handler(int argc, char **argv)
} else if (type == ESP_MATTER_VAL_TYPE_UINT16) {
uint16_t value = atoi(argv[4]);
val = esp_matter_uint16(value);
} else if (type == ESP_MATTER_VAL_TYPE_INT32) {
int32_t value = atoi(argv[4]);
val = esp_matter_int32(value);
} else if (type == ESP_MATTER_VAL_TYPE_UINT32) {
uint32_t value = atoi(argv[4]);
val = esp_matter_uint32(value);
} else if (type == ESP_MATTER_VAL_TYPE_INT64) {
int64_t value = atoi(argv[4]);
val = esp_matter_int64(value);
} else if (type == ESP_MATTER_VAL_TYPE_UINT64) {
uint64_t value = atoi(argv[4]);
val = esp_matter_uint64(value);
@@ -348,10 +365,18 @@ static esp_err_t console_handler(int argc, char **argv)
uint16_t value = 0;
get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value, sizeof(value));
val = esp_matter_uint16(value);
} else if (type == ESP_MATTER_VAL_TYPE_INT32) {
int32_t value = 0;
get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value, sizeof(value));
val = esp_matter_int32(value);
} else if (type == ESP_MATTER_VAL_TYPE_UINT32) {
uint32_t value = 0;
get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value, sizeof(value));
val = esp_matter_uint32(value);
} else if (type == ESP_MATTER_VAL_TYPE_INT64) {
int64_t value = 0;
get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value, sizeof(value));
val = esp_matter_int64(value);
} else if (type == ESP_MATTER_VAL_TYPE_UINT64) {
uint64_t value = 0;
get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value, sizeof(value));
@@ -483,10 +508,18 @@ static esp_matter_val_type_t get_val_type_from_attribute_type(int attribute_type
return ESP_MATTER_VAL_TYPE_UINT16;
break;
case ZCL_INT32S_ATTRIBUTE_TYPE:
return ESP_MATTER_VAL_TYPE_INT32;
break;
case ZCL_INT32U_ATTRIBUTE_TYPE:
return ESP_MATTER_VAL_TYPE_UINT32;
break;
case ZCL_INT64S_ATTRIBUTE_TYPE:
return ESP_MATTER_VAL_TYPE_INT64;
break;
case ZCL_INT64U_ATTRIBUTE_TYPE:
return ESP_MATTER_VAL_TYPE_UINT64;
break;
@@ -644,6 +677,18 @@ esp_err_t get_data_from_attr_val(esp_matter_attr_val_t *val, EmberAfAttributeTyp
}
break;
case ESP_MATTER_VAL_TYPE_INT32:
if (attribute_type) {
*attribute_type = ZCL_INT32S_ATTRIBUTE_TYPE;
}
if (attribute_size) {
*attribute_size = sizeof(int32_t);
}
if (value) {
memcpy(value, (uint8_t *)&val->val.i32, *attribute_size);
}
break;
case ESP_MATTER_VAL_TYPE_UINT32:
if (attribute_type) {
*attribute_type = ZCL_INT32U_ATTRIBUTE_TYPE;
@@ -656,6 +701,18 @@ esp_err_t get_data_from_attr_val(esp_matter_attr_val_t *val, EmberAfAttributeTyp
}
break;
case ESP_MATTER_VAL_TYPE_INT64:
if (attribute_type) {
*attribute_type = ZCL_INT64S_ATTRIBUTE_TYPE;
}
if (attribute_size) {
*attribute_size = sizeof(int64_t);
}
if (value) {
memcpy(value, (uint8_t *)&val->val.i64, *attribute_size);
}
break;
case ESP_MATTER_VAL_TYPE_UINT64:
if (attribute_type) {
*attribute_type = ZCL_INT64U_ATTRIBUTE_TYPE;
@@ -790,6 +847,13 @@ static esp_err_t get_attr_val_from_data(esp_matter_attr_val_t *val, EmberAfAttri
break;
}
case ZCL_INT32S_ATTRIBUTE_TYPE: {
int32_t attribute_value = 0;
memcpy((uint8_t *)&attribute_value, value, sizeof(int32_t));
*val = esp_matter_int32(attribute_value);
break;
}
case ZCL_INT32U_ATTRIBUTE_TYPE: {
uint32_t attribute_value = 0;
memcpy((uint8_t *)&attribute_value, value, sizeof(uint32_t));
@@ -797,6 +861,13 @@ static esp_err_t get_attr_val_from_data(esp_matter_attr_val_t *val, EmberAfAttri
break;
}
case ZCL_INT64S_ATTRIBUTE_TYPE: {
int64_t attribute_value = 0;
memcpy((uint8_t *)&attribute_value, value, sizeof(int64_t));
*val = esp_matter_int64(attribute_value);
break;
}
case ZCL_INT64U_ATTRIBUTE_TYPE: {
uint64_t attribute_value = 0;
memcpy((uint8_t *)&attribute_value, value, sizeof(uint64_t));
@@ -854,9 +925,15 @@ void val_print(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id,
} else if (val->type == ESP_MATTER_VAL_TYPE_UINT16 || val->type == ESP_MATTER_VAL_TYPE_BITMAP16) {
ESP_LOGI(TAG, "********** Endpoint 0x%04X's Cluster 0x%04X's Attribute 0x%04X is %d **********", endpoint_id,
cluster_id, attribute_id, val->val.u16);
} else if (val->type == ESP_MATTER_VAL_TYPE_INT32) {
ESP_LOGI(TAG, "********** Endpoint 0x%04X's Cluster 0x%04X's Attribute 0x%04X is %d **********", endpoint_id,
cluster_id, attribute_id, val->val.i32);
} else if (val->type == ESP_MATTER_VAL_TYPE_UINT32 || val->type == ESP_MATTER_VAL_TYPE_BITMAP32) {
ESP_LOGI(TAG, "********** Endpoint 0x%04X's Cluster 0x%04X's Attribute 0x%04X is %d **********", endpoint_id,
cluster_id, attribute_id, val->val.u32);
} else if (val->type == ESP_MATTER_VAL_TYPE_INT64) {
ESP_LOGI(TAG, "********** Endpoint 0x%04X's Cluster 0x%04X's Attribute 0x%04X is %lld **********", endpoint_id,
cluster_id, attribute_id, val->val.i64);
} else if (val->type == ESP_MATTER_VAL_TYPE_UINT64) {
ESP_LOGI(TAG, "********** Endpoint 0x%04X's Cluster 0x%04X's Attribute 0x%04X is %lld **********", endpoint_id,
cluster_id, attribute_id, val->val.u64);
components/esp_matter/esp_matter_attribute_utils.h
+9 -2
View File
@@ -61,6 +61,8 @@ typedef enum {
ESP_MATTER_VAL_TYPE_INT32,
/** 32 bit unsigned integer */
ESP_MATTER_VAL_TYPE_UINT32,
/** 64 bit signed integer */
ESP_MATTER_VAL_TYPE_INT64,
/** 64 bit unsigned integer */
ESP_MATTER_VAL_TYPE_UINT64,
/** 8 bit enum */
@@ -90,9 +92,11 @@ typedef union {
/** 16 bit unsigned integer */
uint16_t u16;
/** 32 bit signed integer */
int16_t i32;
int32_t i32;
/** 32 bit unsigned integer */
uint32_t u32;
/** 64 bit signed integer */
int64_t i64;
/** 64 bit unsigned integer */
uint64_t u64;
/** Array */
@@ -153,11 +157,14 @@ esp_matter_attr_val_t esp_matter_int16(int16_t val);
esp_matter_attr_val_t esp_matter_uint16(uint16_t val);
/** 32 bit signed integer */
esp_matter_attr_val_t esp_matter_int32(int16_t val);
esp_matter_attr_val_t esp_matter_int32(int32_t val);
/** 32 bit unsigned integer */
esp_matter_attr_val_t esp_matter_uint32(uint32_t val);
/** 64 bit signed integer */
esp_matter_attr_val_t esp_matter_int64(int64_t val);
/** 64 bit unsigned integer */
esp_matter_attr_val_t esp_matter_uint64(uint64_t val);