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

Merge branch 'submodule/update_V1_0_0_1' into 'main'

Browse Source 
Submodule: Update submodule to the new released tag v1.0.0.1

See merge request app-frameworks/esp-matter!251
This commit is contained in:
Shu Chen
2022-12-28 19:06:45 +08:00
parent 524de7d697 f705a89c80
commit 85abe2cdd4
36 changed files with 673 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+7
View File
@@ -71,6 +71,10 @@ variables:
- ./install.sh - ./install.sh
- . ./export.sh - . ./export.sh
.activate_matter_build_env: &activate_matter_build_env
- cd ${CI_PROJECT_DIR}
- source ./connectedhomeip/connectedhomeip/scripts/activate.sh
.build_matter_examples: &build_matter_examples .build_matter_examples: &build_matter_examples
- export MATTER_EXAMPLES_PATH=$ESP_MATTER_PATH/connectedhomeip/connectedhomeip/examples - export MATTER_EXAMPLES_PATH=$ESP_MATTER_PATH/connectedhomeip/connectedhomeip/examples
- cd $MATTER_EXAMPLES_PATH/all-clusters-app/esp32 - cd $MATTER_EXAMPLES_PATH/all-clusters-app/esp32
@@ -118,6 +122,8 @@ variables:
- cp sdkconfig.defaults.backup sdkconfig.defaults - cp sdkconfig.defaults.backup sdkconfig.defaults
.build_examples_idf_v5_0: &build_examples_idf_v5_0 .build_examples_idf_v5_0: &build_examples_idf_v5_0
# Need to install esptool 4.4 and pyparsing 3.0.9 in matter build env for IDF v5.0
- python3 -m pip install esptool==4.4 pyparsing==3.0.9
- cd $ESP_MATTER_PATH/examples/zap_light - cd $ESP_MATTER_PATH/examples/zap_light
- idf.py --preview set-target esp32h2 - idf.py --preview set-target esp32h2
- idf.py build - idf.py build
@@ -145,6 +151,7 @@ variables:
- *chip_submodule_update - *chip_submodule_update
- *setup_matter - *setup_matter
- *setup_idf - *setup_idf
- *activate_matter_build_env
- cd ${ESP_MATTER_PATH} - cd ${ESP_MATTER_PATH}
- mkdir -p ${REPOS_PATH} - mkdir -p ${REPOS_PATH}
# update caches only when setup succeed # update caches only when setup succeed
README.md
+2 -2
View File
@@ -18,8 +18,8 @@ git clone --recursive https://github.com/espressif/esp-matter.git
## Supported ESP-IDF and connectedhomeip versions ## Supported ESP-IDF and connectedhomeip versions
- This SDK currently works with [commit 87bee4de](https://github.com/espressif/connectedhomeip/tree/87bee4de) in v1.0 branch of connectedhomeip. - This SDK currently works with [tag V1.0.0.1](https://github.com/espressif/connectedhomeip/tree/V1.0.0.1) of connectedhomeip.
- For Wi-Fi devices (ESP32, ESP32-C3, ESP32-S3), ESP-IDF [v4.4.2 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.2) is required. - For Wi-Fi devices (ESP32, ESP32-C3, ESP32-S3), ESP-IDF [v4.4.3 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.3) is required.
- For Thread devices (ESP32-H2) and Zigbee Bridge example, ESP-IDF release/v5.0 branch at [commit 20949d44](https://github.com/espressif/esp-idf/tree/20949d44) should be used. - For Thread devices (ESP32-H2) and Zigbee Bridge example, ESP-IDF release/v5.0 branch at [commit 20949d44](https://github.com/espressif/esp-idf/tree/20949d44) should be used.
components/esp_matter/CMakeLists.txt
+1 -1
View File
@@ -13,7 +13,7 @@ set(SRC_DIRS_LIST "."
"${MATTER_SDK_PATH}/src/app/clusters/application-launcher-server" "${MATTER_SDK_PATH}/src/app/clusters/application-launcher-server"
"${MATTER_SDK_PATH}/src/app/clusters/audio-output-server" "${MATTER_SDK_PATH}/src/app/clusters/audio-output-server"
"${MATTER_SDK_PATH}/src/app/clusters/barrier-control-server" "${MATTER_SDK_PATH}/src/app/clusters/barrier-control-server"
"${MATTER_SDK_PATH}/src/app/clusters/basic" "${MATTER_SDK_PATH}/src/app/clusters/basic-information"
"${MATTER_SDK_PATH}/src/app/clusters/bindings" "${MATTER_SDK_PATH}/src/app/clusters/bindings"
"${MATTER_SDK_PATH}/src/app/clusters/bridged-device-basic-information-server" "${MATTER_SDK_PATH}/src/app/clusters/bridged-device-basic-information-server"
"${MATTER_SDK_PATH}/src/app/clusters/channel-server" "${MATTER_SDK_PATH}/src/app/clusters/channel-server"
components/esp_matter/esp_matter_attribute.cpp
+85 -84
View File
@@ -130,133 +130,133 @@ attribute_t *create_access_control_entries_per_fabric(cluster_t *cluster, uint16
} /* attribute */ } /* attribute */
} /* access_control */ } /* access_control */
namespace basic { namespace basic_information {
namespace attribute { namespace attribute {
attribute_t *create_data_model_revision(cluster_t *cluster, uint16_t value) attribute_t *create_data_model_revision(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::DataModelRevision::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::DataModelRevision::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value));
} }
attribute_t *create_vendor_name(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_vendor_name(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::VendorName::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::VendorName::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_vendor_id(cluster_t *cluster, uint16_t value) attribute_t *create_vendor_id(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::VendorID::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::VendorID::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_uint16(value)); esp_matter_uint16(value));
} }
attribute_t *create_product_name(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_product_name(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::ProductName::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ProductName::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_product_id(cluster_t *cluster, uint16_t value) attribute_t *create_product_id(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::ProductID::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ProductID::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_uint16(value)); esp_matter_uint16(value));
} }
attribute_t *create_node_label(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_node_label(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::NodeLabel::Id, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::NodeLabel::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_location(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_location(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::Location::Id, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::Location::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_hardware_version(cluster_t *cluster, uint16_t value) attribute_t *create_hardware_version(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::HardwareVersion::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::HardwareVersion::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value));
} }
attribute_t *create_hardware_version_string(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_hardware_version_string(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::HardwareVersionString::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::HardwareVersionString::Id,
esp_matter_char_str(value, length)); ATTRIBUTE_FLAG_NONE, esp_matter_char_str(value, length));
} }
attribute_t *create_software_version(cluster_t *cluster, uint32_t value) attribute_t *create_software_version(cluster_t *cluster, uint32_t value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::SoftwareVersion::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::SoftwareVersion::Id,
esp_matter_uint32(value)); ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value));
} }
attribute_t *create_software_version_string(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_software_version_string(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::SoftwareVersionString::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::SoftwareVersionString::Id,
esp_matter_char_str(value, length)); ATTRIBUTE_FLAG_NONE, esp_matter_char_str(value, length));
} }
attribute_t *create_capability_minima(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) attribute_t *create_capability_minima(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::CapabilityMinima::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::CapabilityMinima::Id,
esp_matter_array(value, length, count)); ATTRIBUTE_FLAG_NONE, esp_matter_array(value, length, count));
} }
attribute_t *create_manufacturing_date(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_manufacturing_date(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::ManufacturingDate::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ManufacturingDate::Id,
esp_matter_char_str(value, length)); ATTRIBUTE_FLAG_NONE, esp_matter_char_str(value, length));
} }
attribute_t *create_part_number(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_part_number(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::PartNumber::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::PartNumber::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_product_url(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_product_url(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::ProductURL::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ProductURL::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_product_label(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_product_label(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::ProductLabel::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ProductLabel::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_serial_number(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_serial_number(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::SerialNumber::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::SerialNumber::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
attribute_t *create_local_config_diabled(cluster_t *cluster, bool value) attribute_t *create_local_config_diabled(cluster_t *cluster, bool value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::LocalConfigDisabled::Id, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::LocalConfigDisabled::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE , esp_matter_bool(value)); ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_bool(value));
} }
attribute_t *create_reachable(cluster_t *cluster, bool value) attribute_t *create_reachable(cluster_t *cluster, bool value)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::Reachable::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::Reachable::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_bool(value)); esp_matter_bool(value));
} }
attribute_t *create_unique_id(cluster_t *cluster, char *value, uint16_t length) attribute_t *create_unique_id(cluster_t *cluster, char *value, uint16_t length)
{ {
return esp_matter::attribute::create(cluster, Basic::Attributes::UniqueID::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, BasicInformation::Attributes::UniqueID::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_char_str(value, length)); esp_matter_char_str(value, length));
} }
} /* attribute */ } /* attribute */
} /* basic */ } /* basic_information */
namespace binding { namespace binding {
namespace attribute { namespace attribute {
@@ -573,7 +573,7 @@ attribute_t *create_packet_multicast_tx_count(cluster_t *cluster, nullable<uint3
attribute_t *create_packet_unicast_rx_count(cluster_t *cluster, nullable<uint32_t> value) attribute_t *create_packet_unicast_rx_count(cluster_t *cluster, nullable<uint32_t> value)
{ {
return esp_matter::attribute::create(cluster, WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id, return esp_matter::attribute::create(cluster, WiFiNetworkDiagnostics::Attributes::PacketUnicastRxCount::Id,
ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value)); ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
} }
attribute_t *create_packet_unicast_tx_count(cluster_t *cluster, nullable<uint32_t> value) attribute_t *create_packet_unicast_tx_count(cluster_t *cluster, nullable<uint32_t> value)
@@ -743,8 +743,8 @@ namespace attribute {
attribute_t *create_label_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) attribute_t *create_label_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
{ {
return esp_matter::attribute::create(cluster, FixedLabel::Attributes::LabelList::Id, return esp_matter::attribute::create(cluster, FixedLabel::Attributes::LabelList::Id, ATTRIBUTE_FLAG_NONVOLATILE,
ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_array(value, length, count)); esp_matter_array(value, length, count));
} }
} /* attribute */ } /* attribute */
@@ -932,21 +932,21 @@ attribute_t *create_on_off_transition_time(cluster_t *cluster, uint16_t value)
ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint16(value)); ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint16(value));
} }
attribute_t *create_on_transition_time(cluster_t* cluster, nullable<uint16_t> value) attribute_t *create_on_transition_time(cluster_t *cluster, nullable<uint16_t> value)
{ {
return esp_matter::attribute::create(cluster, LevelControl::Attributes::OnTransitionTime::Id, return esp_matter::attribute::create(cluster, LevelControl::Attributes::OnTransitionTime::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE,
esp_matter_nullable_uint16(value)); esp_matter_nullable_uint16(value));
} }
attribute_t *create_off_transition_time(cluster_t* cluster, nullable<uint16_t> value) attribute_t *create_off_transition_time(cluster_t *cluster, nullable<uint16_t> value)
{ {
return esp_matter::attribute::create(cluster, LevelControl::Attributes::OffTransitionTime::Id, return esp_matter::attribute::create(cluster, LevelControl::Attributes::OffTransitionTime::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE,
esp_matter_nullable_uint16(value)); esp_matter_nullable_uint16(value));
} }
attribute_t *create_default_move_rate(cluster_t* cluster, nullable<uint8_t> value) attribute_t *create_default_move_rate(cluster_t *cluster, nullable<uint8_t> value)
{ {
return esp_matter::attribute::create(cluster, LevelControl::Attributes::DefaultMoveRate::Id, return esp_matter::attribute::create(cluster, LevelControl::Attributes::DefaultMoveRate::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE,
@@ -992,8 +992,8 @@ attribute_t *create_color_mode(cluster_t *cluster, uint8_t value)
attribute_t *create_color_control_options(cluster_t *cluster, uint8_t value) attribute_t *create_color_control_options(cluster_t *cluster, uint8_t value)
{ {
return esp_matter::attribute::create(cluster, ColorControl::Attributes::Options::Id, return esp_matter::attribute::create(cluster, ColorControl::Attributes::Options::Id, ATTRIBUTE_FLAG_WRITABLE,
ATTRIBUTE_FLAG_WRITABLE, esp_matter_bitmap8(value)); esp_matter_bitmap8(value));
} }
attribute_t *create_enhanced_color_mode(cluster_t *cluster, uint8_t value) attribute_t *create_enhanced_color_mode(cluster_t *cluster, uint8_t value)
@@ -1093,7 +1093,7 @@ attribute_t *create_number_of_primaries(cluster_t *cluster, nullable<uint8_t> va
ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value)); ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
} }
attribute_t *create_primary_n_x(cluster_t * cluster, uint16_t value, uint8_t index) attribute_t *create_primary_n_x(cluster_t *cluster, uint16_t value, uint8_t index)
{ {
switch (index) { switch (index) {
case 1: case 1:
@@ -1126,7 +1126,7 @@ attribute_t *create_primary_n_x(cluster_t * cluster, uint16_t value, uint8_t ind
return NULL; return NULL;
} }
attribute_t *create_primary_n_y(cluster_t * cluster, uint16_t value, uint8_t index) attribute_t *create_primary_n_y(cluster_t *cluster, uint16_t value, uint8_t index)
{ {
switch (index) { switch (index) {
case 1: case 1:
@@ -1159,7 +1159,7 @@ attribute_t *create_primary_n_y(cluster_t * cluster, uint16_t value, uint8_t ind
return NULL; return NULL;
} }
attribute_t *create_primary_n_intensity(cluster_t * cluster, nullable<uint8_t> value, uint8_t index) attribute_t *create_primary_n_intensity(cluster_t *cluster, nullable<uint8_t> value, uint8_t index)
{ {
switch (index) { switch (index) {
case 1: case 1:
@@ -1243,26 +1243,26 @@ attribute_t *create_occupancy(cluster_t *cluster, uint8_t value)
attribute_t *create_abs_min_heat_setpoint_limit(cluster_t *cluster, int16_t value) attribute_t *create_abs_min_heat_setpoint_limit(cluster_t *cluster, int16_t value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinHeatSetpointLimit::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinHeatSetpointLimit::Id,
esp_matter_int16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_int16(value));
} }
attribute_t *create_abs_max_heat_setpoint_limit(cluster_t *cluster, int16_t value) attribute_t *create_abs_max_heat_setpoint_limit(cluster_t *cluster, int16_t value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id,
esp_matter_int16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_int16(value));
} }
attribute_t *create_abs_min_cool_setpoint_limit(cluster_t *cluster, int16_t value) attribute_t *create_abs_min_cool_setpoint_limit(cluster_t *cluster, int16_t value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinCoolSetpointLimit::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinCoolSetpointLimit::Id,
esp_matter_int16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_int16(value));
} }
attribute_t *create_abs_max_cool_setpoint_limit(cluster_t *cluster, int16_t value) attribute_t *create_abs_max_cool_setpoint_limit(cluster_t *cluster, int16_t value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id,
esp_matter_int16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_int16(value));
} }
attribute_t *create_pi_cooling_demand(cluster_t *cluster, uint8_t value) attribute_t *create_pi_cooling_demand(cluster_t *cluster, uint8_t value)
@@ -1333,10 +1333,9 @@ attribute_t *create_min_setpoint_dead_band(cluster_t *cluster, int8_t value)
attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max) attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
{ {
attribute_t *attribute = esp_matter::attribute::create(cluster, attribute_t *attribute =
Thermostat::Attributes::ControlSequenceOfOperation::Id, esp_matter::attribute::create(cluster, Thermostat::Attributes::ControlSequenceOfOperation::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
esp_matter_enum8(value));
if (!attribute) { if (!attribute) {
ESP_LOGE(TAG, "Could not create attribute"); ESP_LOGE(TAG, "Could not create attribute");
return NULL; return NULL;
@@ -1347,9 +1346,9 @@ attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t va
attribute_t *create_system_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max) attribute_t *create_system_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
{ {
attribute_t *attribute = esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id, attribute_t *attribute =
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id,
esp_matter_enum8(value)); ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
if (!attribute) { if (!attribute) {
ESP_LOGE(TAG, "Could not create attribute"); ESP_LOGE(TAG, "Could not create attribute");
return NULL; return NULL;
@@ -1366,8 +1365,8 @@ attribute_t *create_thermostat_running_mode(cluster_t *cluster, uint8_t value)
attribute_t *create_start_of_week(cluster_t *cluster, uint8_t value) attribute_t *create_start_of_week(cluster_t *cluster, uint8_t value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::StartOfWeek::Id, return esp_matter::attribute::create(cluster, Thermostat::Attributes::StartOfWeek::Id, ATTRIBUTE_FLAG_NONE,
ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value)); esp_matter_enum8(value));
} }
attribute_t *create_number_of_weekly_transitions(cluster_t *cluster, uint8_t value) attribute_t *create_number_of_weekly_transitions(cluster_t *cluster, uint8_t value)
@@ -1385,7 +1384,8 @@ attribute_t *create_number_of_daily_transitions(cluster_t *cluster, uint8_t valu
attribute_t *create_occupied_setback(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_occupied_setback(cluster_t *cluster, nullable<uint8_t> value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::OccupiedSetback::Id, return esp_matter::attribute::create(cluster, Thermostat::Attributes::OccupiedSetback::Id,
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_nullable_uint8(value)); ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_nullable_uint8(value));
} }
attribute_t *create_occupied_setback_min(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_occupied_setback_min(cluster_t *cluster, nullable<uint8_t> value)
@@ -1403,7 +1403,8 @@ attribute_t *create_occupied_setback_max(cluster_t *cluster, nullable<uint8_t> v
attribute_t *create_unoccupied_setback(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_unoccupied_setback(cluster_t *cluster, nullable<uint8_t> value)
{ {
return esp_matter::attribute::create(cluster, Thermostat::Attributes::UnoccupiedSetback::Id, return esp_matter::attribute::create(cluster, Thermostat::Attributes::UnoccupiedSetback::Id,
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_nullable_uint8(value)); ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_nullable_uint8(value));
} }
attribute_t *create_unoccupied_setback_min(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_unoccupied_setback_min(cluster_t *cluster, nullable<uint8_t> value)
@@ -1480,14 +1481,14 @@ attribute_t *create_type(cluster_t *cluster, uint8_t value)
attribute_t *create_physical_closed_limit_lift(cluster_t *cluster, uint16_t value) attribute_t *create_physical_closed_limit_lift(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitLift::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitLift::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value));
} }
attribute_t *create_physical_closed_limit_tilt(cluster_t *cluster, uint16_t value) attribute_t *create_physical_closed_limit_tilt(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitTilt::Id, ATTRIBUTE_FLAG_NONE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitTilt::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value));
} }
attribute_t *create_current_position_lift(cluster_t *cluster, nullable<uint16_t> value) attribute_t *create_current_position_lift(cluster_t *cluster, nullable<uint16_t> value)
@@ -1506,20 +1507,20 @@ attribute_t *create_current_position_tilt(cluster_t *cluster, nullable<uint16_t>
attribute_t *create_number_of_actuations_lift(cluster_t *cluster, uint16_t value) attribute_t *create_number_of_actuations_lift(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsLift::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsLift::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_number_of_actuations_tilt(cluster_t *cluster, uint16_t value) attribute_t *create_number_of_actuations_tilt(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsTilt::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsTilt::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_config_status(cluster_t *cluster, uint8_t value) attribute_t *create_config_status(cluster_t *cluster, uint8_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::ConfigStatus::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::ConfigStatus::Id,
esp_matter_bitmap8(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_bitmap8(value));
} }
attribute_t *create_current_position_lift_percentage(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_current_position_lift_percentage(cluster_t *cluster, nullable<uint8_t> value)
@@ -1538,20 +1539,20 @@ attribute_t *create_current_position_tilt_percentage(cluster_t *cluster, nullabl
attribute_t *create_operational_status(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_operational_status(cluster_t *cluster, nullable<uint8_t> value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::OperationalStatus::Id, ATTRIBUTE_FLAG_NULLABLE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::OperationalStatus::Id,
esp_matter_nullable_uint8(value)); ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
} }
attribute_t *create_target_position_lift_percent_100ths(cluster_t *cluster, nullable<uint16_t> value) attribute_t *create_target_position_lift_percent_100ths(cluster_t *cluster, nullable<uint16_t> value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, ATTRIBUTE_FLAG_NULLABLE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id,
esp_matter_nullable_uint16(value)); ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
} }
attribute_t *create_target_position_tilt_percent_100ths(cluster_t *cluster, nullable<uint16_t> value) attribute_t *create_target_position_tilt_percent_100ths(cluster_t *cluster, nullable<uint16_t> value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, ATTRIBUTE_FLAG_NULLABLE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id,
esp_matter_nullable_uint16(value)); ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
} }
attribute_t *create_end_product_type(cluster_t *cluster, uint8_t value) attribute_t *create_end_product_type(cluster_t *cluster, uint8_t value)
@@ -1576,26 +1577,26 @@ attribute_t *create_current_position_tilt_percent_100ths(cluster_t *cluster, nul
attribute_t *create_installed_open_limit_lift(cluster_t *cluster, uint16_t value) attribute_t *create_installed_open_limit_lift(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitLift::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitLift::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_installed_closed_limit_lift(cluster_t *cluster, uint16_t value) attribute_t *create_installed_closed_limit_lift(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitLift::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitLift::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_installed_open_limit_tilt(cluster_t *cluster, uint16_t value) attribute_t *create_installed_open_limit_tilt(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitTilt::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitTilt::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_installed_closed_limit_tilt(cluster_t *cluster, uint16_t value) attribute_t *create_installed_closed_limit_tilt(cluster_t *cluster, uint16_t value)
{ {
return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitTilt::Id, ATTRIBUTE_FLAG_NONVOLATILE, return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitTilt::Id,
esp_matter_uint16(value)); ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value));
} }
attribute_t *create_mode(cluster_t *cluster, uint16_t value) attribute_t *create_mode(cluster_t *cluster, uint16_t value)
components/esp_matter/esp_matter_attribute.h
+2 -2
View File
@@ -60,7 +60,7 @@ attribute_t *create_access_control_entries_per_fabric(cluster_t *cluster, uint16
} /* attribute */ } /* attribute */
} /* access_control */ } /* access_control */
namespace basic { namespace basic_information {
namespace attribute { namespace attribute {
attribute_t *create_data_model_revision(cluster_t *cluster, uint16_t value); attribute_t *create_data_model_revision(cluster_t *cluster, uint16_t value);
attribute_t *create_vendor_name(cluster_t *cluster, char *value, uint16_t length); attribute_t *create_vendor_name(cluster_t *cluster, char *value, uint16_t length);
@@ -87,7 +87,7 @@ attribute_t *create_local_config_diabled(cluster_t *cluster, bool value);
attribute_t *create_reachable(cluster_t *cluster, bool value); attribute_t *create_reachable(cluster_t *cluster, bool value);
attribute_t *create_unique_id(cluster_t *cluster, char *value, uint16_t length); attribute_t *create_unique_id(cluster_t *cluster, char *value, uint16_t length);
} /* attribute */ } /* attribute */
} /* basic */ } /* basic_information */
namespace binding { namespace binding {
namespace attribute { namespace attribute {
components/esp_matter/esp_matter_attribute_utils.cpp
+1 -1
View File
@@ -1779,7 +1779,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint_id, Clust
if (attribute_size > max_read_length) { if (attribute_size > max_read_length) {
ESP_LOGE(TAG, "Insufficient space for reading attribute: required: %d, max: %d", attribute_size, ESP_LOGE(TAG, "Insufficient space for reading attribute: required: %d, max: %d", attribute_size,
max_read_length); max_read_length);
return EMBER_ZCL_STATUS_INSUFFICIENT_SPACE; return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;
} }
/* Assign value */ /* Assign value */
components/esp_matter/esp_matter_client.cpp
+17 -16
View File
@@ -30,6 +30,7 @@ using chip::ScopedNodeId;
using chip::Server; using chip::Server;
using chip::Messaging::ExchangeManager; using chip::Messaging::ExchangeManager;
using chip::Callback::Callback; using chip::Callback::Callback;
using chip::BitMask;
static const char *TAG = "esp_matter_client"; static const char *TAG = "esp_matter_client";
@@ -262,8 +263,8 @@ esp_err_t send_move(peer_device_t *remote_device, uint16_t remote_endpoint_id, u
LevelControl::Commands::Move::Type command_data; LevelControl::Commands::Move::Type command_data;
command_data.moveMode = (LevelControl::MoveMode)move_mode; command_data.moveMode = (LevelControl::MoveMode)move_mode;
command_data.rate.SetNonNull(rate); command_data.rate.SetNonNull(rate);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id); chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id);
cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback); cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback);
@@ -276,8 +277,8 @@ esp_err_t group_send_move(uint8_t fabric_index, uint16_t group_id, uint8_t move_
LevelControl::Commands::Move::Type command_data; LevelControl::Commands::Move::Type command_data;
command_data.moveMode = (LevelControl::MoveMode)move_mode; command_data.moveMode = (LevelControl::MoveMode)move_mode;
command_data.rate.SetNonNull(rate); command_data.rate.SetNonNull(rate);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager(); chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager();
@@ -291,8 +292,8 @@ esp_err_t send_move_to_level(peer_device_t *remote_device, uint16_t remote_endpo
LevelControl::Commands::MoveToLevel::Type command_data; LevelControl::Commands::MoveToLevel::Type command_data;
command_data.level = level; command_data.level = level;
command_data.transitionTime.SetNonNull(transition_time); command_data.transitionTime.SetNonNull(transition_time);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id); chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id);
cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback); cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback);
@@ -305,8 +306,8 @@ esp_err_t group_send_move_to_level(uint8_t fabric_index, uint16_t group_id, uint
LevelControl::Commands::MoveToLevel::Type command_data; LevelControl::Commands::MoveToLevel::Type command_data;
command_data.level = level; command_data.level = level;
command_data.transitionTime.SetNonNull(transition_time); command_data.transitionTime.SetNonNull(transition_time);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager(); chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager();
@@ -371,8 +372,8 @@ esp_err_t send_step(peer_device_t *remote_device, uint16_t remote_endpoint_id, u
command_data.stepMode = (LevelControl::StepMode)step_mode; command_data.stepMode = (LevelControl::StepMode)step_mode;
command_data.stepSize = step_size; command_data.stepSize = step_size;
command_data.transitionTime.SetNonNull(transition_time); command_data.transitionTime.SetNonNull(transition_time);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id); chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id);
cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback); cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback);
@@ -386,8 +387,8 @@ esp_err_t group_send_step(uint8_t fabric_index, uint16_t group_id, uint8_t step_
command_data.stepMode = (LevelControl::StepMode)step_mode; command_data.stepMode = (LevelControl::StepMode)step_mode;
command_data.stepSize = step_size; command_data.stepSize = step_size;
command_data.transitionTime.SetNonNull(transition_time); command_data.transitionTime.SetNonNull(transition_time);
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager(); chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager();
@@ -426,8 +427,8 @@ esp_err_t send_stop(peer_device_t *remote_device, uint16_t remote_endpoint_id, u
uint8_t option_override) uint8_t option_override)
{ {
LevelControl::Commands::Stop::Type command_data; LevelControl::Commands::Stop::Type command_data;
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id); chip::Controller::LevelControlCluster cluster(*remote_device->GetExchangeManager(), remote_device->GetSecureSession().Value(), remote_endpoint_id);
cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback); cluster.InvokeCommand(command_data, NULL, send_command_success_callback, send_command_failure_callback);
@@ -438,8 +439,8 @@ esp_err_t group_send_stop(uint8_t fabric_index, uint16_t group_id, uint8_t optio
uint8_t option_override) uint8_t option_override)
{ {
LevelControl::Commands::Stop::Type command_data; LevelControl::Commands::Stop::Type command_data;
command_data.optionsMask = option_mask; command_data.optionsMask.SetRaw(option_mask);
command_data.optionsOverride = option_override; command_data.optionsOverride.SetRaw(option_override);
chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager(); chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager();
components/esp_matter/esp_matter_cluster.cpp
+11 -7
View File
@@ -20,7 +20,7 @@
#include <app-common/zap-generated/att-storage.h> #include <app-common/zap-generated/att-storage.h>
#include <app-common/zap-generated/callback.h> #include <app-common/zap-generated/callback.h>
#include <app-common/zap-generated/callbacks/PluginCallbacks.h> #include <app/PluginApplicationCallbacks.h>
static const char *TAG = "esp_matter_cluster"; static const char *TAG = "esp_matter_cluster";
@@ -172,26 +172,30 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags)
} }
} /* access_control */ } /* access_control */
namespace basic { namespace basic_information {
// TODO: Remove this stub function after this PR merged
// https://github.com/project-chip/connectedhomeip/pull/24162
void emberAfBasicInformationClusterServerInitCallback(chip::EndpointId endpoint) {}
const function_generic_t function_list[] = { const function_generic_t function_list[] = {
(function_generic_t)emberAfBasicClusterServerInitCallback, (function_generic_t)emberAfBasicInformationClusterServerInitCallback,
}; };
const int function_flags = CLUSTER_FLAG_INIT_FUNCTION; const int function_flags = CLUSTER_FLAG_INIT_FUNCTION;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{ {
cluster_t *cluster = cluster::create(endpoint, Basic::Id, flags); cluster_t *cluster = cluster::create(endpoint, BasicInformation::Id, flags);
if (!cluster) { if (!cluster) {
ESP_LOGE(TAG, "Could not create cluster"); ESP_LOGE(TAG, "Could not create cluster");
return NULL; return NULL;
} }
if (flags & CLUSTER_FLAG_SERVER) { if (flags & CLUSTER_FLAG_SERVER) {
set_plugin_server_init_callback(cluster, MatterBasicPluginServerInitCallback); set_plugin_server_init_callback(cluster, MatterBasicInformationPluginServerInitCallback);
add_function_list(cluster, function_list, function_flags); add_function_list(cluster, function_list, function_flags);
} }
if (flags & CLUSTER_FLAG_CLIENT) { if (flags & CLUSTER_FLAG_CLIENT) {
set_plugin_client_init_callback(cluster, MatterBasicPluginClientInitCallback); set_plugin_client_init_callback(cluster, MatterBasicInformationPluginClientInitCallback);
} }
if (flags & CLUSTER_FLAG_SERVER) { if (flags & CLUSTER_FLAG_SERVER) {
@@ -220,7 +224,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
return cluster; return cluster;
} }
} /* basic */ } /* basic_information */
namespace binding { namespace binding {
const function_generic_t *function_list = NULL; const function_generic_t *function_list = NULL;
components/esp_matter/esp_matter_cluster.h
+2 -2
View File
@@ -52,7 +52,7 @@ namespace access_control {
cluster_t *create(endpoint_t *endpoint, uint8_t flags); cluster_t *create(endpoint_t *endpoint, uint8_t flags);
} /* access_control */ } /* access_control */
namespace basic { namespace basic_information {
typedef struct config { typedef struct config {
uint16_t cluster_revision; uint16_t cluster_revision;
char node_label[32]; char node_label[32];
@@ -60,7 +60,7 @@ typedef struct config {
} config_t; } config_t;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
} /* basic */ } /* basic_information */
namespace binding { namespace binding {
typedef struct config { typedef struct config {
components/esp_matter/esp_matter_endpoint.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ endpoint_t *add(endpoint_t *endpoint, config_t *config)
descriptor::create(endpoint, CLUSTER_FLAG_SERVER); descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
access_control::create(endpoint, CLUSTER_FLAG_SERVER); access_control::create(endpoint, CLUSTER_FLAG_SERVER);
basic::create(endpoint, &(config->basic), CLUSTER_FLAG_SERVER); basic_information::create(endpoint, &(config->basic_information), CLUSTER_FLAG_SERVER);
general_commissioning::create(endpoint, &(config->general_commissioning), CLUSTER_FLAG_SERVER); general_commissioning::create(endpoint, &(config->general_commissioning), CLUSTER_FLAG_SERVER);
network_commissioning::create(endpoint, &(config->network_commissioning), CLUSTER_FLAG_SERVER); network_commissioning::create(endpoint, &(config->network_commissioning), CLUSTER_FLAG_SERVER);
general_diagnostics::create(endpoint, &(config->general_diagnostics), CLUSTER_FLAG_SERVER); general_diagnostics::create(endpoint, &(config->general_diagnostics), CLUSTER_FLAG_SERVER);
components/esp_matter/esp_matter_endpoint.h
+1 -1
View File
@@ -79,7 +79,7 @@ namespace esp_matter {
namespace endpoint { namespace endpoint {
namespace root_node { namespace root_node {
typedef struct config { typedef struct config {
cluster::basic::config_t basic; cluster::basic_information::config_t basic_information;
cluster::general_commissioning::config_t general_commissioning; cluster::general_commissioning::config_t general_commissioning;
cluster::network_commissioning::config_t network_commissioning; cluster::network_commissioning::config_t network_commissioning;
cluster::general_diagnostics::config_t general_diagnostics; cluster::general_diagnostics::config_t general_diagnostics;
components/esp_matter/zap_common/app/PluginApplicationCallbacks.h
+173
View File
@@ -0,0 +1,173 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
#pragma once
void __attribute__((weak)) MatterIdentifyPluginClientInitCallback() {}
void MatterIdentifyPluginServerInitCallback();
void __attribute__((weak)) MatterGroupsPluginClientInitCallback() {}
void MatterGroupsPluginServerInitCallback();
void __attribute__((weak)) MatterScenesPluginClientInitCallback() {}
void MatterScenesPluginServerInitCallback();
void __attribute__((weak)) MatterOnOffPluginClientInitCallback() {}
void MatterOnOffPluginServerInitCallback();
void __attribute__((weak)) MatterOnOffSwitchConfigurationPluginClientInitCallback() {}
void MatterOnOffSwitchConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterLevelControlPluginClientInitCallback() {}
void MatterLevelControlPluginServerInitCallback();
void __attribute__((weak)) MatterBinaryInputBasicPluginClientInitCallback() {}
void MatterBinaryInputBasicPluginServerInitCallback();
void __attribute__((weak)) MatterPulseWidthModulationPluginClientInitCallback() {}
void MatterPulseWidthModulationPluginServerInitCallback();
void __attribute__((weak)) MatterDescriptorPluginClientInitCallback() {}
void MatterDescriptorPluginServerInitCallback();
void __attribute__((weak)) MatterBindingPluginClientInitCallback() {}
void MatterBindingPluginServerInitCallback();
void __attribute__((weak)) MatterAccessControlPluginClientInitCallback() {}
void MatterAccessControlPluginServerInitCallback();
void __attribute__((weak)) MatterActionsPluginClientInitCallback() {}
void MatterActionsPluginServerInitCallback();
void __attribute__((weak)) MatterBasicInformationPluginClientInitCallback() {}
void MatterBasicInformationPluginServerInitCallback();
void __attribute__((weak)) MatterOtaSoftwareUpdateProviderPluginClientInitCallback() {}
void MatterOtaSoftwareUpdateProviderPluginServerInitCallback();
void __attribute__((weak)) MatterOtaSoftwareUpdateRequestorPluginClientInitCallback() {}
void MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();
void __attribute__((weak)) MatterLocalizationConfigurationPluginClientInitCallback() {}
void MatterLocalizationConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterTimeFormatLocalizationPluginClientInitCallback() {}
void MatterTimeFormatLocalizationPluginServerInitCallback();
void __attribute__((weak)) MatterUnitLocalizationPluginClientInitCallback() {}
void MatterUnitLocalizationPluginServerInitCallback();
void __attribute__((weak)) MatterPowerSourceConfigurationPluginClientInitCallback() {}
void MatterPowerSourceConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterPowerSourcePluginClientInitCallback() {}
void MatterPowerSourcePluginServerInitCallback();
void __attribute__((weak)) MatterGeneralCommissioningPluginClientInitCallback() {}
void MatterGeneralCommissioningPluginServerInitCallback();
void __attribute__((weak)) MatterNetworkCommissioningPluginClientInitCallback() {}
void MatterNetworkCommissioningPluginServerInitCallback();
void __attribute__((weak)) MatterDiagnosticLogsPluginClientInitCallback() {}
void MatterDiagnosticLogsPluginServerInitCallback();
void __attribute__((weak)) MatterGeneralDiagnosticsPluginClientInitCallback() {}
void MatterGeneralDiagnosticsPluginServerInitCallback();
void __attribute__((weak)) MatterSoftwareDiagnosticsPluginClientInitCallback() {}
void MatterSoftwareDiagnosticsPluginServerInitCallback();
void __attribute__((weak)) MatterThreadNetworkDiagnosticsPluginClientInitCallback() {}
void MatterThreadNetworkDiagnosticsPluginServerInitCallback();
void __attribute__((weak)) MatterWiFiNetworkDiagnosticsPluginClientInitCallback() {}
void MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
void __attribute__((weak)) MatterEthernetNetworkDiagnosticsPluginClientInitCallback() {}
void MatterEthernetNetworkDiagnosticsPluginServerInitCallback();
void __attribute__((weak)) MatterTimeSynchronizationPluginClientInitCallback() {}
void MatterTimeSynchronizationPluginServerInitCallback();
void __attribute__((weak)) MatterBridgedDeviceBasicPluginClientInitCallback() {}
void MatterBridgedDeviceBasicPluginServerInitCallback();
void __attribute__((weak)) MatterSwitchPluginClientInitCallback() {}
void MatterSwitchPluginServerInitCallback();
void __attribute__((weak)) MatterAdministratorCommissioningPluginClientInitCallback() {}
void MatterAdministratorCommissioningPluginServerInitCallback();
void __attribute__((weak)) MatterOperationalCredentialsPluginClientInitCallback() {}
void MatterOperationalCredentialsPluginServerInitCallback();
void __attribute__((weak)) MatterGroupKeyManagementPluginClientInitCallback() {}
void MatterGroupKeyManagementPluginServerInitCallback();
void __attribute__((weak)) MatterFixedLabelPluginClientInitCallback() {}
void MatterFixedLabelPluginServerInitCallback();
void __attribute__((weak)) MatterUserLabelPluginClientInitCallback() {}
void MatterUserLabelPluginServerInitCallback();
void __attribute__((weak)) MatterProxyConfigurationPluginClientInitCallback() {}
void MatterProxyConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterProxyDiscoveryPluginClientInitCallback() {}
void MatterProxyDiscoveryPluginServerInitCallback();
void __attribute__((weak)) MatterProxyValidPluginClientInitCallback() {}
void MatterProxyValidPluginServerInitCallback();
void __attribute__((weak)) MatterBooleanStatePluginClientInitCallback() {}
void MatterBooleanStatePluginServerInitCallback();
void __attribute__((weak)) MatterModeSelectPluginClientInitCallback() {}
void MatterModeSelectPluginServerInitCallback();
void __attribute__((weak)) MatterDoorLockPluginClientInitCallback() {}
void MatterDoorLockPluginServerInitCallback();
void __attribute__((weak)) MatterWindowCoveringPluginClientInitCallback() {}
void MatterWindowCoveringPluginServerInitCallback();
void __attribute__((weak)) MatterBarrierControlPluginClientInitCallback() {}
void MatterBarrierControlPluginServerInitCallback();
void __attribute__((weak)) MatterPumpConfigurationAndControlPluginClientInitCallback() {}
void MatterPumpConfigurationAndControlPluginServerInitCallback();
void __attribute__((weak)) MatterThermostatPluginClientInitCallback() {}
void MatterThermostatPluginServerInitCallback();
void __attribute__((weak)) MatterFanControlPluginClientInitCallback() {}
void MatterFanControlPluginServerInitCallback();
void __attribute__((weak)) MatterThermostatUserInterfaceConfigurationPluginClientInitCallback() {}
void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterColorControlPluginClientInitCallback() {}
void MatterColorControlPluginServerInitCallback();
void __attribute__((weak)) MatterBallastConfigurationPluginClientInitCallback() {}
void MatterBallastConfigurationPluginServerInitCallback();
void __attribute__((weak)) MatterIlluminanceMeasurementPluginClientInitCallback() {}
void MatterIlluminanceMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterTemperatureMeasurementPluginClientInitCallback() {}
void MatterTemperatureMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterPressureMeasurementPluginClientInitCallback() {}
void MatterPressureMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterFlowMeasurementPluginClientInitCallback() {}
void MatterFlowMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterRelativeHumidityMeasurementPluginClientInitCallback() {}
void MatterRelativeHumidityMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterOccupancySensingPluginClientInitCallback() {}
void MatterOccupancySensingPluginServerInitCallback();
void __attribute__((weak)) MatterWakeOnLanPluginClientInitCallback() {}
void MatterWakeOnLanPluginServerInitCallback();
void __attribute__((weak)) MatterChannelPluginClientInitCallback() {}
void MatterChannelPluginServerInitCallback();
void __attribute__((weak)) MatterTargetNavigatorPluginClientInitCallback() {}
void MatterTargetNavigatorPluginServerInitCallback();
void __attribute__((weak)) MatterMediaPlaybackPluginClientInitCallback() {}
void MatterMediaPlaybackPluginServerInitCallback();
void __attribute__((weak)) MatterMediaInputPluginClientInitCallback() {}
void MatterMediaInputPluginServerInitCallback();
void __attribute__((weak)) MatterLowPowerPluginClientInitCallback() {}
void MatterLowPowerPluginServerInitCallback();
void __attribute__((weak)) MatterKeypadInputPluginClientInitCallback() {}
void MatterKeypadInputPluginServerInitCallback();
void __attribute__((weak)) MatterContentLauncherPluginClientInitCallback() {}
void MatterContentLauncherPluginServerInitCallback();
void __attribute__((weak)) MatterAudioOutputPluginClientInitCallback() {}
void MatterAudioOutputPluginServerInitCallback();
void __attribute__((weak)) MatterApplicationLauncherPluginClientInitCallback() {}
void MatterApplicationLauncherPluginServerInitCallback();
void __attribute__((weak)) MatterApplicationBasicPluginClientInitCallback() {}
void MatterApplicationBasicPluginServerInitCallback();
void __attribute__((weak)) MatterAccountLoginPluginClientInitCallback() {}
void MatterAccountLoginPluginServerInitCallback();
void __attribute__((weak)) MatterElectricalMeasurementPluginClientInitCallback() {}
void MatterElectricalMeasurementPluginServerInitCallback();
void __attribute__((weak)) MatterTestClusterPluginClientInitCallback() {}
void MatterTestClusterPluginServerInitCallback();
void __attribute__((weak)) MatterFaultInjectionPluginClientInitCallback() {}
void MatterFaultInjectionPluginServerInitCallback();
#include <zap-generated/endpoint_config.h>
#if FIXED_ENDPOINT_COUNT == 0 // Use esp-matter data model
#include <esp_matter_cluster.h>
#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common();
#else
#include <zap-generated/PluginApplicationCallbacks.h>
#endif
components/esp_matter/zap_common/zap-generated/CHIPClusters.h
+8 -8
View File
@@ -130,13 +130,13 @@ public:
~ActionsCluster() {} ~ActionsCluster() {}
}; };
class DLL_EXPORT BasicCluster : public ClusterBase class DLL_EXPORT BasicInformationCluster : public ClusterBase
{ {
public: public:
BasicCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : BasicInformationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) :
ClusterBase(exchangeManager, session, app::Clusters::Basic::Id, endpoint) ClusterBase(exchangeManager, session, app::Clusters::BasicInformation::Id, endpoint)
{} {}
~BasicCluster() {} ~BasicInformationCluster() {}
}; };
class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
@@ -622,13 +622,13 @@ public:
~ElectricalMeasurementCluster() {} ~ElectricalMeasurementCluster() {}
}; };
class DLL_EXPORT TestClusterCluster : public ClusterBase class DLL_EXPORT UnitTestingCluster : public ClusterBase
{ {
public: public:
TestClusterCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : UnitTestingCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) :
ClusterBase(exchangeManager, session, app::Clusters::TestCluster::Id, endpoint) ClusterBase(exchangeManager, session, app::Clusters::UnitTesting::Id, endpoint)
{} {}
~TestClusterCluster() {} ~UnitTestingCluster() {}
}; };
} // namespace Controller } // namespace Controller
components/esp_matter/zap_common/zap-generated/gen_config.h
+2 -2
View File
@@ -173,7 +173,7 @@
#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in audio output #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in audio output
#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in channel #define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in channel
#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in color control #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in color control
#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in content launch #define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in content launch
#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in identify #define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in identify
#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in keypad input #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in keypad input
#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in level control #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in level control
@@ -181,7 +181,7 @@
#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in media input #define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in media input
#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in media playback #define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in media playback
#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in on off #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in on off
#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in ota provider #define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in ota software update provider
#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in target navigator #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in target navigator
#define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in wake on lan #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in wake on lan
#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in window covering #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (16) // used in window covering
components/esp_matter_controller/esp_matter_commissioner.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ esp_err_t init(uint16_t commissioner_port)
MutableByteSpan rcacSpan(rcac.Get(), Controller::kMaxCHIPDERCertLength); MutableByteSpan rcacSpan(rcac.Get(), Controller::kMaxCHIPDERCertLength);
Crypto::P256Keypair ephemeralKey; Crypto::P256Keypair ephemeralKey;
if (ephemeralKey.Initialize() != CHIP_NO_ERROR) { if (ephemeralKey.Initialize(Crypto::ECPKeyTarget::ECDSA) != CHIP_NO_ERROR) {
return ESP_FAIL; return ESP_FAIL;
} }
components/esp_matter_controller/logger/zap-generated/DataModelLogger.cpp
+237 -200
View File
File diff suppressed because it is too large Load Diff
components/esp_matter_controller/logger/zap-generated/DataModelLogger.h
+28 -26
View File
@@ -44,7 +44,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value); const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value); const chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -56,7 +56,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value); const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::DoubleNestedStructList::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TimeSynchronization::Structs::DstOffsetType::DecodableType & value); const chip::app::Clusters::TimeSynchronization::Structs::DstOffsetType::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -81,20 +81,22 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value); const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value); const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value); const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType & value); const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::NestedStruct::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::NestedStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::NestedStructList::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::NestedStructList::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value); const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value); const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType & value);
static CHIP_ERROR static CHIP_ERROR
LogValue(const char * label, size_t indent, LogValue(const char * label, size_t indent,
const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType & value); const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType & value);
@@ -113,7 +115,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ModeSelect::Structs::SemanticTag::DecodableType & value); const chip::app::Clusters::ModeSelect::Structs::SemanticTag::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value); const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -123,9 +125,9 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value); const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::TestFabricScoped::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType & value); const chip::app::Clusters::UnitTesting::Structs::TestListStructOctet::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value); const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value);
static CHIP_ERROR static CHIP_ERROR
@@ -150,13 +152,13 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Actions::Events::ActionFailed::DecodableType & value); const chip::app::Clusters::Actions::Events::ActionFailed::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Events::StartUp::DecodableType & value); const chip::app::Clusters::BasicInformation::Events::StartUp::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Events::ShutDown::DecodableType & value); const chip::app::Clusters::BasicInformation::Events::ShutDown::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Events::Leave::DecodableType & value); const chip::app::Clusters::BasicInformation::Events::Leave::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Events::ReachableChanged::DecodableType & value); const chip::app::Clusters::BasicInformation::Events::ReachableChanged::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType & value); const chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -261,9 +263,9 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::PumpConfigurationAndControl::Events::TurbineOperation::DecodableType & value); const chip::app::Clusters::PumpConfigurationAndControl::Events::TurbineOperation::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Events::TestEvent::DecodableType & value); const chip::app::Clusters::UnitTesting::Events::TestEvent::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Events::TestFabricScopedEvent::DecodableType & value); const chip::app::Clusters::UnitTesting::Events::TestFabricScopedEvent::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & value); const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & value);
@@ -363,29 +365,29 @@ static CHIP_ERROR
LogValue(const char * label, size_t indent, LogValue(const char * label, size_t indent,
const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value); const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestSpecificResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestAddArgumentsResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestSimpleArgumentResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType & value);
static CHIP_ERROR static CHIP_ERROR
LogValue(const char * label, size_t indent, LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestStructArrayArgumentResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::DecodableType & value);
static CHIP_ERROR static CHIP_ERROR
LogValue(const char * label, size_t indent, LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestComplexNullableOptionalResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::BooleanResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::SimpleStructResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::DecodableType & value);
static CHIP_ERROR static CHIP_ERROR
LogValue(const char * label, size_t indent, LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value); const chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value);
connectedhomeip/connectedhomeip
+1 -1
Submodule connectedhomeip/connectedhomeip updated: 87bee4de25...ca086f2f39
examples/blemesh_bridge/main/zap-generated/PluginApplicationCallbacks.h
-24
View File
@@ -1,24 +0,0 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
#pragma once
#include <esp_matter_cluster.h>
#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common();
examples/blemesh_bridge/platform/ESP32_custom/BUILD.gn
-2
View File
@@ -82,8 +82,6 @@ static_library("ESP32_custom") {
"ConfigurationManagerImpl.h", "ConfigurationManagerImpl.h",
"ConnectivityManagerImpl.cpp", "ConnectivityManagerImpl.cpp",
"ConnectivityManagerImpl.h", "ConnectivityManagerImpl.h",
"DeviceNetworkProvisioningDelegateImpl.cpp",
"DeviceNetworkProvisioningDelegateImpl.h",
"DiagnosticDataProviderImpl.cpp", "DiagnosticDataProviderImpl.cpp",
"DiagnosticDataProviderImpl.h", "DiagnosticDataProviderImpl.h",
"ESP32Config.cpp", "ESP32Config.cpp",
examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.cpp
-1
View File
@@ -1 +0,0 @@
../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp
examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.h
-1
View File
@@ -1 +0,0 @@
../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h
examples/common/external_platform/BUILD.gn
-2
View File
@@ -79,8 +79,6 @@ static_library("ESP32_custom") {
"ConfigurationManagerImpl.h", "ConfigurationManagerImpl.h",
"ConnectivityManagerImpl.cpp", "ConnectivityManagerImpl.cpp",
"ConnectivityManagerImpl.h", "ConnectivityManagerImpl.h",
"DeviceNetworkProvisioningDelegateImpl.cpp",
"DeviceNetworkProvisioningDelegateImpl.h",
"DiagnosticDataProviderImpl.cpp", "DiagnosticDataProviderImpl.cpp",
"DiagnosticDataProviderImpl.h", "DiagnosticDataProviderImpl.h",
"ESP32Config.cpp", "ESP32Config.cpp",
examples/generic_switch/sdkconfig.defaults
+3
View File
@@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y
#disable BT connection reattempt
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
#enable lwip ipv6 autoconfig #enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_IPV6_AUTOCONFIG=y
examples/light/main/zap-generated/PluginApplicationCallbacks.h
-24
View File
@@ -1,24 +0,0 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
#pragma once
#include <esp_matter_cluster.h>
#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common();
examples/light/sdkconfig.defaults
+3
View File
@@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y
#disable BT connection reattempt
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
#enable lwip ipv6 autoconfig #enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_IPV6_AUTOCONFIG=y
examples/light/sdkconfig.defaults.ext_plat_ci
+3
View File
@@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y
#disable BT connection reattempt
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
#enable lwip ipv6 autoconfig #enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_IPV6_AUTOCONFIG=y
examples/light_switch/main/zap-generated/PluginApplicationCallbacks.h
-24
View File
@@ -1,24 +0,0 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
#pragma once
#include <esp_matter_cluster.h>
#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common();
examples/light_switch/sdkconfig.defaults
+3
View File
@@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y
#disable BT connection reattempt
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
#enable lwip ipv6 autoconfig #enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_IPV6_AUTOCONFIG=y
examples/zap_light/main/zap-generated/PluginApplicationCallbacks.h
+1 -3
View File
@@ -19,8 +19,6 @@
#pragma once #pragma once
#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
#define MATTER_PLUGINS_INIT \ #define MATTER_PLUGINS_INIT \
MatterIdentifyPluginServerInitCallback(); \ MatterIdentifyPluginServerInitCallback(); \
MatterGroupsPluginServerInitCallback(); \ MatterGroupsPluginServerInitCallback(); \
@@ -28,7 +26,7 @@
MatterLevelControlPluginServerInitCallback(); \ MatterLevelControlPluginServerInitCallback(); \
MatterDescriptorPluginServerInitCallback(); \ MatterDescriptorPluginServerInitCallback(); \
MatterAccessControlPluginServerInitCallback(); \ MatterAccessControlPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \ MatterBasicInformationPluginServerInitCallback(); \
MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \ MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \
MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); \ MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); \
MatterLocalizationConfigurationPluginServerInitCallback(); \ MatterLocalizationConfigurationPluginServerInitCallback(); \
examples/zap_light/main/zap-generated/access.h
+18 -18
View File
@@ -36,9 +36,9 @@
/* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
/* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \
/* Cluster: Basic, Attribute: Location, Privilege: view */ \ /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \
/* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \
/* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -61,9 +61,9 @@
/* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
/* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \
/* Cluster: Basic, Attribute: Location, Privilege: view */ \ /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \
/* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \
/* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \ 0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \ 1, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -86,9 +86,9 @@
/* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \
/* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \
/* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \
/* Cluster: Basic, Attribute: Location, Privilege: view */ \ /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \
/* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \
/* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
@@ -110,9 +110,9 @@
8, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ 8, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ 40, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ 40, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ 40, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ 63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -126,9 +126,9 @@
16384, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ 16384, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ 5, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ 6, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ 16, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ 4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ 0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -142,9 +142,9 @@
kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
examples/zap_light/main/zap-generated/callback-stub.cpp
+44 -154
View File
@@ -1,24 +1,5 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
#include <app-common/zap-generated/callback.h> #include <app-common/zap-generated/callback.h>
#include <app-common/zap-generated/cluster-id.h> #include <app-common/zap-generated/ids/Clusters.h>
#include <lib/support/Span.h> #include <lib/support/Span.h>
#include <protocols/interaction_model/Constants.h> #include <protocols/interaction_model/Constants.h>
@@ -29,85 +10,85 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
{ {
switch (clusterId) switch (clusterId)
{ {
case ZCL_ACCESS_CONTROL_CLUSTER_ID: case app::Clusters::AccessControl::Id:
emberAfAccessControlClusterInitCallback(endpoint); emberAfAccessControlClusterInitCallback(endpoint);
break; break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID: case app::Clusters::AdministratorCommissioning::Id:
emberAfAdministratorCommissioningClusterInitCallback(endpoint); emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break; break;
case ZCL_BASIC_CLUSTER_ID: case app::Clusters::BasicInformation::Id:
emberAfBasicClusterInitCallback(endpoint); emberAfBasicInformationClusterInitCallback(endpoint);
break; break;
case ZCL_COLOR_CONTROL_CLUSTER_ID: case app::Clusters::ColorControl::Id:
emberAfColorControlClusterInitCallback(endpoint); emberAfColorControlClusterInitCallback(endpoint);
break; break;
case ZCL_DESCRIPTOR_CLUSTER_ID: case app::Clusters::Descriptor::Id:
emberAfDescriptorClusterInitCallback(endpoint); emberAfDescriptorClusterInitCallback(endpoint);
break; break;
case ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID: case app::Clusters::DiagnosticLogs::Id:
emberAfDiagnosticLogsClusterInitCallback(endpoint); emberAfDiagnosticLogsClusterInitCallback(endpoint);
break; break;
case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID: case app::Clusters::EthernetNetworkDiagnostics::Id:
emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint); emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
break; break;
case ZCL_FIXED_LABEL_CLUSTER_ID: case app::Clusters::FixedLabel::Id:
emberAfFixedLabelClusterInitCallback(endpoint); emberAfFixedLabelClusterInitCallback(endpoint);
break; break;
case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID: case app::Clusters::GeneralCommissioning::Id:
emberAfGeneralCommissioningClusterInitCallback(endpoint); emberAfGeneralCommissioningClusterInitCallback(endpoint);
break; break;
case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID: case app::Clusters::GeneralDiagnostics::Id:
emberAfGeneralDiagnosticsClusterInitCallback(endpoint); emberAfGeneralDiagnosticsClusterInitCallback(endpoint);
break; break;
case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID: case app::Clusters::GroupKeyManagement::Id:
emberAfGroupKeyManagementClusterInitCallback(endpoint); emberAfGroupKeyManagementClusterInitCallback(endpoint);
break; break;
case ZCL_GROUPS_CLUSTER_ID: case app::Clusters::Groups::Id:
emberAfGroupsClusterInitCallback(endpoint); emberAfGroupsClusterInitCallback(endpoint);
break; break;
case ZCL_IDENTIFY_CLUSTER_ID: case app::Clusters::Identify::Id:
emberAfIdentifyClusterInitCallback(endpoint); emberAfIdentifyClusterInitCallback(endpoint);
break; break;
case ZCL_LEVEL_CONTROL_CLUSTER_ID: case app::Clusters::LevelControl::Id:
emberAfLevelControlClusterInitCallback(endpoint); emberAfLevelControlClusterInitCallback(endpoint);
break; break;
case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID: case app::Clusters::LocalizationConfiguration::Id:
emberAfLocalizationConfigurationClusterInitCallback(endpoint); emberAfLocalizationConfigurationClusterInitCallback(endpoint);
break; break;
case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: case app::Clusters::NetworkCommissioning::Id:
emberAfNetworkCommissioningClusterInitCallback(endpoint); emberAfNetworkCommissioningClusterInitCallback(endpoint);
break; break;
case ZCL_OTA_PROVIDER_CLUSTER_ID: case app::Clusters::OccupancySensing::Id:
emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint);
break;
case ZCL_OTA_REQUESTOR_CLUSTER_ID:
emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
break;
case ZCL_OCCUPANCY_SENSING_CLUSTER_ID:
emberAfOccupancySensingClusterInitCallback(endpoint); emberAfOccupancySensingClusterInitCallback(endpoint);
break; break;
case ZCL_ON_OFF_CLUSTER_ID: case app::Clusters::OnOff::Id:
emberAfOnOffClusterInitCallback(endpoint); emberAfOnOffClusterInitCallback(endpoint);
break; break;
case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: case app::Clusters::OperationalCredentials::Id:
emberAfOperationalCredentialsClusterInitCallback(endpoint); emberAfOperationalCredentialsClusterInitCallback(endpoint);
break; break;
case ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID: case app::Clusters::OtaSoftwareUpdateProvider::Id:
emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint);
break;
case app::Clusters::OtaSoftwareUpdateRequestor::Id:
emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint);
break;
case app::Clusters::SoftwareDiagnostics::Id:
emberAfSoftwareDiagnosticsClusterInitCallback(endpoint); emberAfSoftwareDiagnosticsClusterInitCallback(endpoint);
break; break;
case ZCL_SWITCH_CLUSTER_ID: case app::Clusters::Switch::Id:
emberAfSwitchClusterInitCallback(endpoint); emberAfSwitchClusterInitCallback(endpoint);
break; break;
case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID: case app::Clusters::ThreadNetworkDiagnostics::Id:
emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint); emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint);
break; break;
case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID: case app::Clusters::TimeFormatLocalization::Id:
emberAfTimeFormatLocalizationClusterInitCallback(endpoint); emberAfTimeFormatLocalizationClusterInitCallback(endpoint);
break; break;
case ZCL_USER_LABEL_CLUSTER_ID: case app::Clusters::UserLabel::Id:
emberAfUserLabelClusterInitCallback(endpoint); emberAfUserLabelClusterInitCallback(endpoint);
break; break;
case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID: case app::Clusters::WiFiNetworkDiagnostics::Id:
emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint); emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
break; break;
default: default:
@@ -115,7 +96,6 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
break; break;
} }
} }
void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint) void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint)
{ {
// To prevent warning // To prevent warning
@@ -126,7 +106,7 @@ void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(
// To prevent warning // To prevent warning
(void) endpoint; (void) endpoint;
} }
void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint) void __attribute__((weak)) emberAfBasicInformationClusterInitCallback(EndpointId endpoint)
{ {
// To prevent warning // To prevent warning
(void) endpoint; (void) endpoint;
@@ -196,16 +176,6 @@ void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(Endpoi
// To prevent warning // To prevent warning
(void) endpoint; (void) endpoint;
} }
void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfOtaSoftwareUpdateRequestorClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint) void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint)
{ {
// To prevent warning // To prevent warning
@@ -221,6 +191,16 @@ void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(Endp
// To prevent warning // To prevent warning
(void) endpoint; (void) endpoint;
} }
void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfOtaSoftwareUpdateRequestorClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint) void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint)
{ {
// To prevent warning // To prevent warning
@@ -251,93 +231,3 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
// To prevent warning // To prevent warning
(void) endpoint; (void) endpoint;
} }
//
// Non-Cluster Related Callbacks
//
void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
EmberAfAttributeWritePermission __attribute__((weak))
emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
uint8_t type)
{
return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
}
bool __attribute__((weak)) emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
{
return true;
}
bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
{
return true;
}
bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
{
return false;
}
bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
{
return false;
}
bool __attribute__((weak)) emberAfMessageSentCallback(const MessageSendDestination & destination, EmberApsFrame * apsFrame,
uint16_t msgLen, uint8_t * message, EmberStatus status)
{
return false;
}
EmberAfStatus __attribute__((weak))
emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
uint8_t * buffer, uint16_t maxReadLength)
{
return EMBER_ZCL_STATUS_FAILURE;
}
EmberAfStatus __attribute__((weak))
emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata,
uint8_t * buffer)
{
return EMBER_ZCL_STATUS_FAILURE;
}
uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
{
return 0;
}
bool __attribute__((weak))
emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
{
return false;
}
void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
EmberStatus __attribute__((weak))
emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
{
return EMBER_LIBRARY_NOT_PRESENT;
}
bool __attribute__((weak)) emberAfStartMoveCallback()
{
return false;
}
chip::Protocols::InteractionModel::Status __attribute__((weak))
MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
uint8_t * value)
{
return chip::Protocols::InteractionModel::Status::Success;
}
void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type,
uint16_t size, uint8_t * value)
{}
examples/zap_light/main/zap-generated/endpoint_config.h
+6 -9
View File
@@ -104,7 +104,7 @@
{ \ { \
\ \
/* Endpoint: 0, Cluster: Groups (server) */ \ /* Endpoint: 0, Cluster: Groups (server) */ \
{ 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* name support */ \ { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* NameSupport */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \
\ \
@@ -130,7 +130,7 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\ \
/* Endpoint: 0, Cluster: Basic (server) */ \ /* Endpoint: 0, Cluster: Basic Information (server) */ \
{ 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \ { 0x00000000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
ZAP_EMPTY_DEFAULT() }, /* DataModelRevision */ \ ZAP_EMPTY_DEFAULT() }, /* DataModelRevision */ \
{ 0x00000001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \ { 0x00000001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON), \
@@ -460,7 +460,7 @@
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \
\ \
/* Endpoint: 1, Cluster: Groups (server) */ \ /* Endpoint: 1, Cluster: Groups (server) */ \
{ 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* name support */ \ { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* NameSupport */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \
\ \
@@ -556,9 +556,6 @@
const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = { \ const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = { \
(EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback, \ (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback, \
}; \ }; \
const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \
(EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \
}; \
const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = { \ const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = { \
(EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback, \ (EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback, \
(EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback, \ (EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback, \
@@ -796,13 +793,13 @@
.generatedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\
},\ },\
{ \ { \
/* Endpoint: 0, Cluster: Basic (server) */ \ /* Endpoint: 0, Cluster: Basic Information (server) */ \
.clusterId = 0x00000028, \ .clusterId = 0x00000028, \
.attributes = ZAP_ATTRIBUTE_INDEX(16), \ .attributes = ZAP_ATTRIBUTE_INDEX(16), \
.attributeCount = 22, \ .attributeCount = 22, \
.clusterSize = 41, \ .clusterSize = 41, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .mask = ZAP_CLUSTER_MASK(SERVER), \
.functions = chipFuncArrayBasicServer, \ .functions = NULL, \
.acceptedCommandList = nullptr ,\ .acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\
},\ },\
examples/zap_light/main/zap-generated/gen_config.h
+9 -9
View File
@@ -35,9 +35,9 @@
#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -93,17 +93,17 @@
#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER #define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
#define EMBER_AF_PLUGIN_ACCESS_CONTROL #define EMBER_AF_PLUGIN_ACCESS_CONTROL
// Use this macro to check if the server side of the Basic cluster is included // Use this macro to check if the server side of the Basic Information cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER #define ZCL_USING_BASIC_INFORMATION_CLUSTER_SERVER
#define EMBER_AF_PLUGIN_BASIC_SERVER #define EMBER_AF_PLUGIN_BASIC_INFORMATION_SERVER
#define EMBER_AF_PLUGIN_BASIC #define EMBER_AF_PLUGIN_BASIC_INFORMATION
// Use this macro to check if the client side of the OTA Software Update Provider cluster is included // Use this macro to check if the client side of the OTA Software Update Provider cluster is included
#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT #define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT
#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT
// Use this macro to check if the server side of the OTA Software Update Requestor cluster is included // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included
#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER #define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER
#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER
#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR
examples/zap_light/main/zap-generated/gen_tokens.h
-45
View File
@@ -1,45 +0,0 @@
/*
*
* Copyright (c) 2022 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// THIS FILE IS GENERATED BY ZAP
// Prevent multiple inclusion
#pragma once
// This file contains the tokens for attributes stored in flash
// Identifier tags for tokens
// Types for the tokens
#ifdef DEFINETYPES
#endif // DEFINETYPES
// Actual token definitions
#ifdef DEFINETOKENS
#endif // DEFINETOKENS
// Macro snippet that loads all the attributes from tokens
#define GENERATED_TOKEN_LOADER(endpoint) \
do \
{ \
} while (false)
// Macro snippet that saves the attribute to token
#define GENERATED_TOKEN_SAVER \
do \
{ \
} while (false)
examples/zap_light/sdkconfig.defaults
+3
View File
@@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y
#disable BT connection reattempt
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
#enable lwip ipv6 autoconfig #enable lwip ipv6 autoconfig
CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_IPV6_AUTOCONFIG=y