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

zap_light: Updated zap-generated to use color_temperature_light

Browse Source
This commit is contained in:
Chirag Atal
2022-06-01 19:08:48 +05:30
parent cf1f290e10
commit e3df95bf63
6 changed files with 709 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/zap_light/main/app_driver.cpp
+8
View File
@@ -99,6 +99,7 @@ esp_err_t app_driver_attribute_set_defaults()
/* Get the default value (current value) from matter submodule and update the app_driver */
esp_err_t err = ESP_OK;
uint8_t value;
uint16_t value_u16;
uint16_t endpoint_id = 0;
uint32_t cluster_id = 0;
uint32_t attribute_id = 0;
@@ -132,6 +133,13 @@ esp_err_t app_driver_attribute_set_defaults()
val = esp_matter_uint8(value);
err |= app_driver_attribute_update(endpoint_id, cluster_id, attribute_id, &val);
endpoint_id = light_endpoint_id;
cluster_id = ColorControl::Id;
attribute_id = ColorControl::Attributes::ColorTemperature::Id;
attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value_u16, sizeof(uint16_t));
val = esp_matter_uint16(value_u16);
err |= app_driver_attribute_update(endpoint_id, cluster_id, attribute_id, &val);
return err;
}
examples/zap_light/main/zap-generated/IMClusterCommandHandler.cpp
+36
View File
@@ -205,6 +205,42 @@ void DispatchServerCommand(CommandHandler *apCommandObj,
}
break;
}
case Commands::MoveToColorTemperature::Id: {
Commands::MoveToColorTemperature::DecodableType commandData;
TLVError = DataModel::Decode(aDataTlv, commandData);
if (TLVError == CHIP_NO_ERROR) {
wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(
apCommandObj, aCommandPath, commandData);
}
break;
}
case Commands::StopMoveStep::Id: {
Commands::StopMoveStep::DecodableType commandData;
TLVError = DataModel::Decode(aDataTlv, commandData);
if (TLVError == CHIP_NO_ERROR) {
wasHandled = emberAfColorControlClusterStopMoveStepCallback(
apCommandObj, aCommandPath, commandData);
}
break;
}
case Commands::MoveColorTemperature::Id: {
Commands::MoveColorTemperature::DecodableType commandData;
TLVError = DataModel::Decode(aDataTlv, commandData);
if (TLVError == CHIP_NO_ERROR) {
wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(
apCommandObj, aCommandPath, commandData);
}
break;
}
case Commands::StepColorTemperature::Id: {
Commands::StepColorTemperature::DecodableType commandData;
TLVError = DataModel::Decode(aDataTlv, commandData);
if (TLVError == CHIP_NO_ERROR) {
wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(
apCommandObj, aCommandPath, commandData);
}
break;
}
default: {
// Unrecognized command ID, error status will apply.
apCommandObj->AddStatus(
examples/zap_light/main/zap-generated/endpoint_config.h
+37 -57
View File
@@ -80,13 +80,13 @@
\
/* Endpoint: 1, Cluster: Color Control (server) */ \
{ \
(uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFEFF \
(uint16_t)0xFA, (uint16_t)0x0, (uint16_t)0xFEFF \
} /* start up color temperature mireds */ \
}
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
// This is an array of EmberAfAttributeMetadata structures.
#define GENERATED_ATTRIBUTE_COUNT 94
#define GENERATED_ATTRIBUTE_COUNT 88
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -291,42 +291,16 @@
{0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(5)}, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Basic (server) */ \
{0x00000000, ZAP_TYPE(INT16U), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* DataModelRevision */ \
{0x00000001, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* VendorName */ \
{0x00000002, ZAP_TYPE(VENDOR_ID), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* VendorID */ \
{0x00000003, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* ProductName */ \
{0x00000004, ZAP_TYPE(INT16U), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* ProductID */ \
{0x00000005, ZAP_TYPE(CHAR_STRING), 33, \
ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT()}, /* NodeLabel */ \
{0x00000006, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | \
ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_EMPTY_DEFAULT()}, /* Location */ \
{0x00000007, ZAP_TYPE(INT16U), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* HardwareVersion */ \
{0x00000008, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* HardwareVersionString */ \
{0x00000009, ZAP_TYPE(INT32U), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* SoftwareVersion */ \
{0x0000000A, ZAP_TYPE(CHAR_STRING), 0, \
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT()}, /* SoftwareVersionString */ \
{0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
{0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT()}, /* device list */ \
{0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT()}, /* server list */ \
{0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT()}, /* client list */ \
{0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
ZAP_EMPTY_DEFAULT()}, /* parts list */ \
{0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(1)}, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Color Control (server) */ \
@@ -334,12 +308,14 @@
ZAP_SIMPLE_DEFAULT(0x80)}, /* current hue */ \
{0x00000001, ZAP_TYPE(INT8U), 1, 0, \
ZAP_SIMPLE_DEFAULT(0xFF)}, /* current saturation */ \
{0x00000003, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x616B)}, /* current x */ \
{0x00000004, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x607D)}, /* current y */ \
{0x00000007, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x00FA)}, /* color temperature */ \
{0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), \
ZAP_SIMPLE_DEFAULT(0x00)}, /* color control options */ \
{0x0000400B, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0x0000)}, /* color temp physical min */ \
{0x0000400C, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(0xFEFF)}, /* color temp physical max */ \
{0x0000400D, ZAP_TYPE(INT16U), 2, 0, \
ZAP_EMPTY_DEFAULT()}, /* couple color temp to level min-mireds */ \
{0x00004010, ZAP_TYPE(INT16U), 2, \
@@ -347,7 +323,7 @@
ZAP_MIN_MAX_DEFAULTS_INDEX( \
1)}, /* start up color temperature mireds */ \
{0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, \
ZAP_SIMPLE_DEFAULT(3)}, /* ClusterRevision */ \
ZAP_SIMPLE_DEFAULT(5)}, /* ClusterRevision */ \
}
// This is an array of EmberAfCluster structures.
@@ -527,6 +503,10 @@
0x00000007 /* MoveToColor */, \
0x00000008 /* MoveColor */, \
0x00000009 /* StepColor */, \
0x0000000A /* MoveToColorTemperature */, \
0x00000047 /* StopMoveStep */, \
0x0000004B /* MoveColorTemperature */, \
0x0000004C /* StepColorTemperature */, \
chip::kInvalidCommandId /* end of list */, \
}
@@ -725,22 +705,22 @@
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Basic (server) */ \
.clusterId = 0x00000028, \
/* Endpoint: 1, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
.attributes = ZAP_ATTRIBUTE_INDEX(74), \
.attributeCount = 12, \
.clusterSize = 35, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayBasicServer, \
.attributeCount = 5, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = NULL, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
},\
{ \
/* Endpoint: 1, Cluster: Color Control (server) */ \
.clusterId = 0x00000300, \
.attributes = ZAP_ATTRIBUTE_INDEX(86), \
.attributeCount = 8, \
.clusterSize = 13, \
.attributes = ZAP_ATTRIBUTE_INDEX(79), \
.attributeCount = 9, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
.functions = chipFuncArrayColorControlServer, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\
@@ -756,7 +736,7 @@
// This is an array of EmberAfEndpointType structures.
#define GENERATED_ENDPOINT_TYPES \
{ {ZAP_CLUSTER_INDEX(0), 12, 155}, {ZAP_CLUSTER_INDEX(12), 7, 70}, }
{ {ZAP_CLUSTER_INDEX(0), 12, 155}, {ZAP_CLUSTER_INDEX(12), 7, 39}, }
// Largest attribute size is needed for various buffers
#define ATTRIBUTE_LARGEST (255)
@@ -765,10 +745,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
"ATTRIBUTE_LARGEST larger than expected");
// Total size of singleton attributes
#define ATTRIBUTE_SINGLETONS_SIZE (70)
#define ATTRIBUTE_SINGLETONS_SIZE (35)
// Total size of attribute storage
#define ATTRIBUTE_MAX_SIZE (225)
#define ATTRIBUTE_MAX_SIZE (194)
// Number of fixed endpoints
#define FIXED_ENDPOINT_COUNT (2)
@@ -780,12 +760,12 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
// Array of profile ids
#define FIXED_PROFILE_IDS \
{ 0x0103, 0x0104 }
{ 0x0103, 0x0103 }
// Array of device types
#define FIXED_DEVICE_TYPES \
{ \
{0x0016, 1}, { 0x0102, 1 } \
{0x0016, 1}, { 0x010C, 1 } \
}
// Array of device type offsets
examples/zap_light/main/zap-generated/gen_config.h
+2 -2
View File
@@ -31,9 +31,9 @@
/**** Cluster endpoint counts ****/
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
examples/zap_light/main/zap-generated/light.matter
+39 -3
View File
@@ -207,9 +207,10 @@ server cluster ColorControl = 768 {
readonly attribute int8u currentHue = 0;
readonly attribute int8u currentSaturation = 1;
readonly attribute int16u currentX = 3;
readonly attribute int16u currentY = 4;
readonly attribute int16u colorTemperature = 7;
attribute bitmap8 colorControlOptions = 15;
readonly attribute int16u colorTempPhysicalMin = 16395;
readonly attribute int16u colorTempPhysicalMax = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -293,6 +294,37 @@ server cluster ColorControl = 768 {
BITMAP8 optionsOverride = 4;
}
request struct MoveToColorTemperatureRequest {
INT16U colorTemperature = 0;
INT16U transitionTime = 1;
BITMAP8 optionsMask = 2;
BITMAP8 optionsOverride = 3;
}
request struct StopMoveStepRequest {
BITMAP8 optionsMask = 0;
BITMAP8 optionsOverride = 1;
}
request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
INT16U rate = 1;
INT16U colorTemperatureMinimum = 2;
INT16U colorTemperatureMaximum = 3;
BITMAP8 optionsMask = 4;
BITMAP8 optionsOverride = 5;
}
request struct StepColorTemperatureRequest {
HueStepMode stepMode = 0;
INT16U stepSize = 1;
INT16U transitionTime = 2;
INT16U colorTemperatureMinimum = 3;
INT16U colorTemperatureMaximum = 4;
BITMAP8 optionsMask = 5;
BITMAP8 optionsOverride = 6;
}
command MoveToHue(MoveToHueRequest): DefaultSuccess = 0;
command MoveHue(MoveHueRequest): DefaultSuccess = 1;
command StepHue(StepHueRequest): DefaultSuccess = 2;
@@ -303,6 +335,10 @@ server cluster ColorControl = 768 {
command MoveToColor(MoveToColorRequest): DefaultSuccess = 7;
command MoveColor(MoveColorRequest): DefaultSuccess = 8;
command StepColor(StepColorRequest): DefaultSuccess = 9;
command MoveToColorTemperature(MoveToColorTemperatureRequest): DefaultSuccess = 10;
command StopMoveStep(StopMoveStepRequest): DefaultSuccess = 71;
command MoveColorTemperature(MoveColorTemperatureRequest): DefaultSuccess = 75;
command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
}
server cluster Descriptor = 29 {
@@ -1174,8 +1210,8 @@ endpoint 0 {
}
endpoint 1 {
server cluster Basic;
server cluster ColorControl;
server cluster Descriptor;
server cluster Groups;
server cluster Identify;
server cluster LevelControl;
examples/zap_light/main/zap-generated/light.zap
+587 -349
View File
File diff suppressed because it is too large Load Diff