From f705a89c807030ff394a10217e96fa9552e4fb7e Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Wed, 21 Dec 2022 12:06:59 +0800 Subject: [PATCH] Submodule: Update submodule to the new released tag v1.0.0.1 CI: Activate matter build env before building the examples sdkconfig: update sdkconfig to disable BT connection reattempt --- .gitlab-ci.yml | 7 + README.md | 4 +- components/esp_matter/CMakeLists.txt | 2 +- .../esp_matter/esp_matter_attribute.cpp | 169 +++---- components/esp_matter/esp_matter_attribute.h | 4 +- .../esp_matter/esp_matter_attribute_utils.cpp | 2 +- components/esp_matter/esp_matter_client.cpp | 33 +- components/esp_matter/esp_matter_cluster.cpp | 18 +- components/esp_matter/esp_matter_cluster.h | 4 +- components/esp_matter/esp_matter_endpoint.cpp | 2 +- components/esp_matter/esp_matter_endpoint.h | 2 +- .../app/PluginApplicationCallbacks.h | 173 +++++++ .../zap_common/zap-generated/CHIPClusters.h | 16 +- .../zap_common/zap-generated/gen_config.h | 4 +- .../esp_matter_commissioner.cpp | 2 +- .../logger/zap-generated/DataModelLogger.cpp | 437 ++++++++++-------- .../logger/zap-generated/DataModelLogger.h | 54 +-- connectedhomeip/connectedhomeip | 2 +- .../PluginApplicationCallbacks.h | 24 - .../platform/ESP32_custom/BUILD.gn | 2 - .../DeviceNetworkProvisioningDelegateImpl.cpp | 1 - .../DeviceNetworkProvisioningDelegateImpl.h | 1 - examples/common/external_platform/BUILD.gn | 2 - examples/generic_switch/sdkconfig.defaults | 3 + .../PluginApplicationCallbacks.h | 24 - examples/light/sdkconfig.defaults | 3 + examples/light/sdkconfig.defaults.ext_plat_ci | 3 + .../PluginApplicationCallbacks.h | 24 - examples/light_switch/sdkconfig.defaults | 3 + .../PluginApplicationCallbacks.h | 4 +- .../zap_light/main/zap-generated/access.h | 36 +- .../main/zap-generated/callback-stub.cpp | 198 ++------ .../main/zap-generated/endpoint_config.h | 15 +- .../zap_light/main/zap-generated/gen_config.h | 18 +- .../zap_light/main/zap-generated/gen_tokens.h | 45 -- examples/zap_light/sdkconfig.defaults | 3 + 36 files changed, 673 insertions(+), 671 deletions(-) create mode 100644 components/esp_matter/zap_common/app/PluginApplicationCallbacks.h delete mode 100644 examples/blemesh_bridge/main/zap-generated/PluginApplicationCallbacks.h delete mode 120000 examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.cpp delete mode 120000 examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.h delete mode 100644 examples/light/main/zap-generated/PluginApplicationCallbacks.h delete mode 100644 examples/light_switch/main/zap-generated/PluginApplicationCallbacks.h delete mode 100644 examples/zap_light/main/zap-generated/gen_tokens.h diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1cb7f82c..51ea9ad7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,6 +71,10 @@ variables: - ./install.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 - export MATTER_EXAMPLES_PATH=$ESP_MATTER_PATH/connectedhomeip/connectedhomeip/examples - cd $MATTER_EXAMPLES_PATH/all-clusters-app/esp32 @@ -118,6 +122,8 @@ variables: - cp sdkconfig.defaults.backup sdkconfig.defaults .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 - idf.py --preview set-target esp32h2 - idf.py build @@ -145,6 +151,7 @@ variables: - *chip_submodule_update - *setup_matter - *setup_idf + - *activate_matter_build_env - cd ${ESP_MATTER_PATH} - mkdir -p ${REPOS_PATH} # update caches only when setup succeed diff --git a/README.md b/README.md index 616782037..fc5efb54a 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ git clone --recursive https://github.com/espressif/esp-matter.git ## 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. -- 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. +- 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.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. diff --git a/components/esp_matter/CMakeLists.txt b/components/esp_matter/CMakeLists.txt index 7de9e8b46..104baa9fb 100644 --- a/components/esp_matter/CMakeLists.txt +++ b/components/esp_matter/CMakeLists.txt @@ -13,7 +13,7 @@ set(SRC_DIRS_LIST "." "${MATTER_SDK_PATH}/src/app/clusters/application-launcher-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/basic" + "${MATTER_SDK_PATH}/src/app/clusters/basic-information" "${MATTER_SDK_PATH}/src/app/clusters/bindings" "${MATTER_SDK_PATH}/src/app/clusters/bridged-device-basic-information-server" "${MATTER_SDK_PATH}/src/app/clusters/channel-server" diff --git a/components/esp_matter/esp_matter_attribute.cpp b/components/esp_matter/esp_matter_attribute.cpp index 438514383..0c89daf56 100644 --- a/components/esp_matter/esp_matter_attribute.cpp +++ b/components/esp_matter/esp_matter_attribute.cpp @@ -130,133 +130,133 @@ attribute_t *create_access_control_entries_per_fabric(cluster_t *cluster, uint16 } /* attribute */ } /* access_control */ -namespace basic { +namespace basic_information { namespace attribute { 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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::DataModelRevision::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); } 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)); } 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)); } 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)); } 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)); } 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, esp_matter_char_str(value, 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, esp_matter_char_str(value, length)); } attribute_t *create_hardware_version(cluster_t *cluster, uint16_t value) { - return esp_matter::attribute::create(cluster, Basic::Attributes::HardwareVersion::Id, ATTRIBUTE_FLAG_NONE, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::HardwareVersion::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); } 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, - esp_matter_char_str(value, length)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::HardwareVersionString::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_char_str(value, length)); } attribute_t *create_software_version(cluster_t *cluster, uint32_t value) { - return esp_matter::attribute::create(cluster, Basic::Attributes::SoftwareVersion::Id, ATTRIBUTE_FLAG_NONE, - esp_matter_uint32(value)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::SoftwareVersion::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value)); } 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, - esp_matter_char_str(value, length)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::SoftwareVersionString::Id, + 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) { - return esp_matter::attribute::create(cluster, Basic::Attributes::CapabilityMinima::Id, ATTRIBUTE_FLAG_NONE, - esp_matter_array(value, length, count)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::CapabilityMinima::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_array(value, length, count)); } 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, - esp_matter_char_str(value, length)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::ManufacturingDate::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_char_str(value, 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)); } 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)); } 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)); } 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)); } attribute_t *create_local_config_diabled(cluster_t *cluster, bool value) { - return esp_matter::attribute::create(cluster, Basic::Attributes::LocalConfigDisabled::Id, - ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE , esp_matter_bool(value)); + return esp_matter::attribute::create(cluster, BasicInformation::Attributes::LocalConfigDisabled::Id, + ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_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)); } 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)); } } /* attribute */ -} /* basic */ +} /* basic_information */ namespace binding { namespace attribute { @@ -573,7 +573,7 @@ attribute_t *create_packet_multicast_tx_count(cluster_t *cluster, nullable value) { 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 value) @@ -743,8 +743,8 @@ namespace attribute { 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, - ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_array(value, length, count)); + return esp_matter::attribute::create(cluster, FixedLabel::Attributes::LabelList::Id, ATTRIBUTE_FLAG_NONVOLATILE, + esp_matter_array(value, length, count)); } } /* 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_t *create_on_transition_time(cluster_t* cluster, nullable value) +attribute_t *create_on_transition_time(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, LevelControl::Attributes::OnTransitionTime::Id, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_off_transition_time(cluster_t* cluster, nullable value) +attribute_t *create_off_transition_time(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, LevelControl::Attributes::OffTransitionTime::Id, ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_default_move_rate(cluster_t* cluster, nullable value) +attribute_t *create_default_move_rate(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, LevelControl::Attributes::DefaultMoveRate::Id, 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) { - return esp_matter::attribute::create(cluster, ColorControl::Attributes::Options::Id, - ATTRIBUTE_FLAG_WRITABLE, esp_matter_bitmap8(value)); + return esp_matter::attribute::create(cluster, ColorControl::Attributes::Options::Id, ATTRIBUTE_FLAG_WRITABLE, + esp_matter_bitmap8(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 va 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) { case 1: @@ -1126,7 +1126,7 @@ attribute_t *create_primary_n_x(cluster_t * cluster, uint16_t value, uint8_t ind 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) { case 1: @@ -1159,7 +1159,7 @@ attribute_t *create_primary_n_y(cluster_t * cluster, uint16_t value, uint8_t ind return NULL; } -attribute_t *create_primary_n_intensity(cluster_t * cluster, nullable value, uint8_t index) +attribute_t *create_primary_n_intensity(cluster_t *cluster, nullable value, uint8_t index) { switch (index) { 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) { - return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinHeatSetpointLimit::Id, ATTRIBUTE_FLAG_NONE, - esp_matter_int16(value)); + return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinHeatSetpointLimit::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_int16(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, - esp_matter_int16(value)); + return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_int16(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, - esp_matter_int16(value)); + return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMinCoolSetpointLimit::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_int16(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, - esp_matter_int16(value)); + return esp_matter::attribute::create(cluster, Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_int16(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 *attribute = esp_matter::attribute::create(cluster, - Thermostat::Attributes::ControlSequenceOfOperation::Id, - ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, - esp_matter_enum8(value)); + attribute_t *attribute = + esp_matter::attribute::create(cluster, Thermostat::Attributes::ControlSequenceOfOperation::Id, + ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value)); if (!attribute) { ESP_LOGE(TAG, "Could not create attribute"); 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 *attribute = esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id, - ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, - esp_matter_enum8(value)); + attribute_t *attribute = + esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id, + ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value)); if (!attribute) { ESP_LOGE(TAG, "Could not create attribute"); 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) { - return esp_matter::attribute::create(cluster, Thermostat::Attributes::StartOfWeek::Id, - ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value)); + return esp_matter::attribute::create(cluster, Thermostat::Attributes::StartOfWeek::Id, ATTRIBUTE_FLAG_NONE, + esp_matter_enum8(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 value) { 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 value) @@ -1403,7 +1403,8 @@ attribute_t *create_occupied_setback_max(cluster_t *cluster, nullable v attribute_t *create_unoccupied_setback(cluster_t *cluster, nullable value) { 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 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) { - return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitLift::Id, ATTRIBUTE_FLAG_NONE, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitLift::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_uint16(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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::PhysicalClosedLimitTilt::Id, + ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); } attribute_t *create_current_position_lift(cluster_t *cluster, nullable value) @@ -1506,20 +1507,20 @@ attribute_t *create_current_position_tilt(cluster_t *cluster, nullable 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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsLift::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::NumberOfActuationsTilt::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(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, - esp_matter_bitmap8(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::ConfigStatus::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_bitmap8(value)); } attribute_t *create_current_position_lift_percentage(cluster_t *cluster, nullable 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 value) { - return esp_matter::attribute::create(cluster, WindowCovering::Attributes::OperationalStatus::Id, ATTRIBUTE_FLAG_NULLABLE, - esp_matter_nullable_uint8(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::OperationalStatus::Id, + ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value)); } attribute_t *create_target_position_lift_percent_100ths(cluster_t *cluster, nullable value) { - return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, ATTRIBUTE_FLAG_NULLABLE, - esp_matter_nullable_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionLiftPercent100ths::Id, + ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } attribute_t *create_target_position_tilt_percent_100ths(cluster_t *cluster, nullable value) { - return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, ATTRIBUTE_FLAG_NULLABLE, - esp_matter_nullable_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::TargetPositionTiltPercent100ths::Id, + ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(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) { - return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitLift::Id, ATTRIBUTE_FLAG_NONVOLATILE, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitLift::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitLift::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledOpenLimitTilt::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(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, - esp_matter_uint16(value)); + return esp_matter::attribute::create(cluster, WindowCovering::Attributes::InstalledClosedLimitTilt::Id, + ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint16(value)); } attribute_t *create_mode(cluster_t *cluster, uint16_t value) diff --git a/components/esp_matter/esp_matter_attribute.h b/components/esp_matter/esp_matter_attribute.h index 61acf9021..ead48e1af 100644 --- a/components/esp_matter/esp_matter_attribute.h +++ b/components/esp_matter/esp_matter_attribute.h @@ -60,7 +60,7 @@ attribute_t *create_access_control_entries_per_fabric(cluster_t *cluster, uint16 } /* attribute */ } /* access_control */ -namespace basic { +namespace basic_information { namespace attribute { 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); @@ -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_unique_id(cluster_t *cluster, char *value, uint16_t length); } /* attribute */ -} /* basic */ +} /* basic_information */ namespace binding { namespace attribute { diff --git a/components/esp_matter/esp_matter_attribute_utils.cpp b/components/esp_matter/esp_matter_attribute_utils.cpp index 673faee26..63499e8ef 100644 --- a/components/esp_matter/esp_matter_attribute_utils.cpp +++ b/components/esp_matter/esp_matter_attribute_utils.cpp @@ -1779,7 +1779,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint_id, Clust if (attribute_size > max_read_length) { ESP_LOGE(TAG, "Insufficient space for reading attribute: required: %d, max: %d", attribute_size, max_read_length); - return EMBER_ZCL_STATUS_INSUFFICIENT_SPACE; + return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED; } /* Assign value */ diff --git a/components/esp_matter/esp_matter_client.cpp b/components/esp_matter/esp_matter_client.cpp index e1daba085..b175bdc09 100644 --- a/components/esp_matter/esp_matter_client.cpp +++ b/components/esp_matter/esp_matter_client.cpp @@ -30,6 +30,7 @@ using chip::ScopedNodeId; using chip::Server; using chip::Messaging::ExchangeManager; using chip::Callback::Callback; +using chip::BitMask; 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; command_data.moveMode = (LevelControl::MoveMode)move_mode; command_data.rate.SetNonNull(rate); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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); @@ -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; command_data.moveMode = (LevelControl::MoveMode)move_mode; command_data.rate.SetNonNull(rate); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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; command_data.level = level; command_data.transitionTime.SetNonNull(transition_time); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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); @@ -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; command_data.level = level; command_data.transitionTime.SetNonNull(transition_time); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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.stepSize = step_size; command_data.transitionTime.SetNonNull(transition_time); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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); @@ -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.stepSize = step_size; command_data.transitionTime.SetNonNull(transition_time); - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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) { LevelControl::Commands::Stop::Type command_data; - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); 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); @@ -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) { LevelControl::Commands::Stop::Type command_data; - command_data.optionsMask = option_mask; - command_data.optionsOverride = option_override; + command_data.optionsMask.SetRaw(option_mask); + command_data.optionsOverride.SetRaw(option_override); chip::Messaging::ExchangeManager & exchange_mgr = chip::Server::GetInstance().GetExchangeManager(); diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp index b4926677c..9b58dc85f 100644 --- a/components/esp_matter/esp_matter_cluster.cpp +++ b/components/esp_matter/esp_matter_cluster.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include static const char *TAG = "esp_matter_cluster"; @@ -172,26 +172,30 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags) } } /* 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[] = { - (function_generic_t)emberAfBasicClusterServerInitCallback, + (function_generic_t)emberAfBasicInformationClusterServerInitCallback, }; const int function_flags = CLUSTER_FLAG_INIT_FUNCTION; 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) { ESP_LOGE(TAG, "Could not create cluster"); return NULL; } 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); } if (flags & CLUSTER_FLAG_CLIENT) { - set_plugin_client_init_callback(cluster, MatterBasicPluginClientInitCallback); + set_plugin_client_init_callback(cluster, MatterBasicInformationPluginClientInitCallback); } if (flags & CLUSTER_FLAG_SERVER) { @@ -220,7 +224,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) return cluster; } -} /* basic */ +} /* basic_information */ namespace binding { const function_generic_t *function_list = NULL; diff --git a/components/esp_matter/esp_matter_cluster.h b/components/esp_matter/esp_matter_cluster.h index 3fc5e259e..db9b739f6 100644 --- a/components/esp_matter/esp_matter_cluster.h +++ b/components/esp_matter/esp_matter_cluster.h @@ -52,7 +52,7 @@ namespace access_control { cluster_t *create(endpoint_t *endpoint, uint8_t flags); } /* access_control */ -namespace basic { +namespace basic_information { typedef struct config { uint16_t cluster_revision; char node_label[32]; @@ -60,7 +60,7 @@ typedef struct config { } config_t; cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); -} /* basic */ +} /* basic_information */ namespace binding { typedef struct config { diff --git a/components/esp_matter/esp_matter_endpoint.cpp b/components/esp_matter/esp_matter_endpoint.cpp index 63e5ad93a..30a9ff3ad 100644 --- a/components/esp_matter/esp_matter_endpoint.cpp +++ b/components/esp_matter/esp_matter_endpoint.cpp @@ -49,7 +49,7 @@ endpoint_t *add(endpoint_t *endpoint, config_t *config) descriptor::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); network_commissioning::create(endpoint, &(config->network_commissioning), CLUSTER_FLAG_SERVER); general_diagnostics::create(endpoint, &(config->general_diagnostics), CLUSTER_FLAG_SERVER); diff --git a/components/esp_matter/esp_matter_endpoint.h b/components/esp_matter/esp_matter_endpoint.h index cca043aff..295424a8f 100644 --- a/components/esp_matter/esp_matter_endpoint.h +++ b/components/esp_matter/esp_matter_endpoint.h @@ -79,7 +79,7 @@ namespace esp_matter { namespace endpoint { namespace root_node { typedef struct config { - cluster::basic::config_t basic; + cluster::basic_information::config_t basic_information; cluster::general_commissioning::config_t general_commissioning; cluster::network_commissioning::config_t network_commissioning; cluster::general_diagnostics::config_t general_diagnostics; diff --git a/components/esp_matter/zap_common/app/PluginApplicationCallbacks.h b/components/esp_matter/zap_common/app/PluginApplicationCallbacks.h new file mode 100644 index 000000000..d43ac5767 --- /dev/null +++ b/components/esp_matter/zap_common/app/PluginApplicationCallbacks.h @@ -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 +#if FIXED_ENDPOINT_COUNT == 0 // Use esp-matter data model +#include + +#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common(); +#else + +#include +#endif diff --git a/components/esp_matter/zap_common/zap-generated/CHIPClusters.h b/components/esp_matter/zap_common/zap-generated/CHIPClusters.h index 96283a050..90f78f5e2 100644 --- a/components/esp_matter/zap_common/zap-generated/CHIPClusters.h +++ b/components/esp_matter/zap_common/zap-generated/CHIPClusters.h @@ -130,13 +130,13 @@ public: ~ActionsCluster() {} }; -class DLL_EXPORT BasicCluster : public ClusterBase +class DLL_EXPORT BasicInformationCluster : public ClusterBase { public: - BasicCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Basic::Id, endpoint) + BasicInformationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : + ClusterBase(exchangeManager, session, app::Clusters::BasicInformation::Id, endpoint) {} - ~BasicCluster() {} + ~BasicInformationCluster() {} }; class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase @@ -622,13 +622,13 @@ public: ~ElectricalMeasurementCluster() {} }; -class DLL_EXPORT TestClusterCluster : public ClusterBase +class DLL_EXPORT UnitTestingCluster : public ClusterBase { public: - TestClusterCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::TestCluster::Id, endpoint) + UnitTestingCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : + ClusterBase(exchangeManager, session, app::Clusters::UnitTesting::Id, endpoint) {} - ~TestClusterCluster() {} + ~UnitTestingCluster() {} }; } // namespace Controller diff --git a/components/esp_matter/zap_common/zap-generated/gen_config.h b/components/esp_matter/zap_common/zap-generated/gen_config.h index 5fd3133a6..323538260 100644 --- a/components/esp_matter/zap_common/zap-generated/gen_config.h +++ b/components/esp_matter/zap_common/zap-generated/gen_config.h @@ -173,7 +173,7 @@ #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_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_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 @@ -181,7 +181,7 @@ #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_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_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 diff --git a/components/esp_matter_controller/esp_matter_commissioner.cpp b/components/esp_matter_controller/esp_matter_commissioner.cpp index 1768b3e1a..c4179073c 100644 --- a/components/esp_matter_controller/esp_matter_commissioner.cpp +++ b/components/esp_matter_controller/esp_matter_commissioner.cpp @@ -142,7 +142,7 @@ esp_err_t init(uint16_t commissioner_port) MutableByteSpan rcacSpan(rcac.Get(), Controller::kMaxCHIPDERCertLength); Crypto::P256Keypair ephemeralKey; - if (ephemeralKey.Initialize() != CHIP_NO_ERROR) { + if (ephemeralKey.Initialize(Crypto::ECPKeyTarget::ECDSA) != CHIP_NO_ERROR) { return ESP_FAIL; } diff --git a/components/esp_matter_controller/logger/zap-generated/DataModelLogger.cpp b/components/esp_matter_controller/logger/zap-generated/DataModelLogger.cpp index 75fc1c4ab..b6698830a 100644 --- a/components/esp_matter_controller/logger/zap-generated/DataModelLogger.cpp +++ b/components/esp_matter_controller/logger/zap-generated/DataModelLogger.cpp @@ -377,8 +377,9 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -546,7 +547,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -1021,6 +1022,39 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("ClientNodeId", indent + 1, value.clientNodeId); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ClientNodeId'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("ICid", indent + 1, value.ICid); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ICid'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value) { @@ -1175,7 +1209,7 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -1207,7 +1241,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -1369,7 +1403,7 @@ DataModelLogger::LogValue(const char * label, size_t indent, } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -1837,7 +1871,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -2045,7 +2079,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -2118,7 +2152,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::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) { DataModelLogger::LogString(label, indent, "{"); { @@ -2575,7 +2609,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Ac return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Basic::Events::StartUp::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const BasicInformation::Events::StartUp::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -2590,14 +2625,16 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Ba return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Basic::Events::ShutDown::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const BasicInformation::Events::ShutDown::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Basic::Events::Leave::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const BasicInformation::Events::Leave::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -2613,7 +2650,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Ba return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const Basic::Events::ReachableChanged::DecodableType & value) + const BasicInformation::Events::ReachableChanged::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -3101,10 +3138,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = DataModelLogger::LogValue("NewPosition", indent + 1, value.newPosition); + CHIP_ERROR err = DataModelLogger::LogValue("PreviousPosition", indent + 1, value.previousPosition); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'NewPosition'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PreviousPosition'"); return err; } } @@ -3488,7 +3525,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const TestCluster::Events::TestEvent::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const UnitTesting::Events::TestEvent::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -3544,7 +3581,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Te return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Events::TestFabricScopedEvent::DecodableType & value) + const UnitTesting::Events::TestFabricScopedEvent::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -4015,7 +4052,7 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestSpecificResponse::DecodableType & value) + const UnitTesting::Commands::TestSpecificResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue)); @@ -4023,7 +4060,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestAddArgumentsResponse::DecodableType & value) + const UnitTesting::Commands::TestAddArgumentsResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue)); @@ -4031,7 +4068,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestSimpleArgumentResponse::DecodableType & value) + const UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("returnValue", indent + 1, value.returnValue)); @@ -4039,7 +4076,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestStructArrayArgumentResponse::DecodableType & value) + const UnitTesting::Commands::TestStructArrayArgumentResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1)); @@ -4052,7 +4089,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestListInt8UReverseResponse::DecodableType & value) + const UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1)); @@ -4060,7 +4097,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestEnumsResponse::DecodableType & value) + const UnitTesting::Commands::TestEnumsResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1)); @@ -4069,7 +4106,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestNullableOptionalResponse::DecodableType & value) + const UnitTesting::Commands::TestNullableOptionalResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("wasPresent", indent + 1, value.wasPresent)); @@ -4080,7 +4117,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestComplexNullableOptionalResponse::DecodableType & value) + const UnitTesting::Commands::TestComplexNullableOptionalResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("nullableIntWasNull", indent + 1, value.nullableIntWasNull)); @@ -4121,7 +4158,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::BooleanResponse::DecodableType & value) + const UnitTesting::Commands::BooleanResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value)); @@ -4129,7 +4166,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::SimpleStructResponse::DecodableType & value) + const UnitTesting::Commands::SimpleStructResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("arg1", indent + 1, value.arg1)); @@ -4137,7 +4174,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestEmitTestEventResponse::DecodableType & value) + const UnitTesting::Commands::TestEmitTestEventResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value)); @@ -4145,7 +4182,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value) + const UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("value", indent + 1, value.value)); @@ -4208,7 +4245,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case Groups::Attributes::NameSupport::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("name support", 1, value); + return DataModelLogger::LogValue("NameSupport", 1, value); } case Groups::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; @@ -4435,7 +4472,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("MaxFrequency", 1, value); } case LevelControl::Attributes::Options::Id: { - uint8_t value; + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Options", 1, value); } @@ -4763,130 +4800,130 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case Basic::Id: { + case BasicInformation::Id: { switch (path.mAttributeId) { - case Basic::Attributes::DataModelRevision::Id: { + case BasicInformation::Attributes::DataModelRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("DataModelRevision", 1, value); } - case Basic::Attributes::VendorName::Id: { + case BasicInformation::Attributes::VendorName::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("VendorName", 1, value); } - case Basic::Attributes::VendorID::Id: { + case BasicInformation::Attributes::VendorID::Id: { chip::VendorId value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("VendorID", 1, value); } - case Basic::Attributes::ProductName::Id: { + case BasicInformation::Attributes::ProductName::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductName", 1, value); } - case Basic::Attributes::ProductID::Id: { + case BasicInformation::Attributes::ProductID::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductID", 1, value); } - case Basic::Attributes::NodeLabel::Id: { + case BasicInformation::Attributes::NodeLabel::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("NodeLabel", 1, value); } - case Basic::Attributes::Location::Id: { + case BasicInformation::Attributes::Location::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Location", 1, value); } - case Basic::Attributes::HardwareVersion::Id: { + case BasicInformation::Attributes::HardwareVersion::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("HardwareVersion", 1, value); } - case Basic::Attributes::HardwareVersionString::Id: { + case BasicInformation::Attributes::HardwareVersionString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("HardwareVersionString", 1, value); } - case Basic::Attributes::SoftwareVersion::Id: { + case BasicInformation::Attributes::SoftwareVersion::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SoftwareVersion", 1, value); } - case Basic::Attributes::SoftwareVersionString::Id: { + case BasicInformation::Attributes::SoftwareVersionString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SoftwareVersionString", 1, value); } - case Basic::Attributes::ManufacturingDate::Id: { + case BasicInformation::Attributes::ManufacturingDate::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ManufacturingDate", 1, value); } - case Basic::Attributes::PartNumber::Id: { + case BasicInformation::Attributes::PartNumber::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("PartNumber", 1, value); } - case Basic::Attributes::ProductURL::Id: { + case BasicInformation::Attributes::ProductURL::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductURL", 1, value); } - case Basic::Attributes::ProductLabel::Id: { + case BasicInformation::Attributes::ProductLabel::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductLabel", 1, value); } - case Basic::Attributes::SerialNumber::Id: { + case BasicInformation::Attributes::SerialNumber::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SerialNumber", 1, value); } - case Basic::Attributes::LocalConfigDisabled::Id: { + case BasicInformation::Attributes::LocalConfigDisabled::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("LocalConfigDisabled", 1, value); } - case Basic::Attributes::Reachable::Id: { + case BasicInformation::Attributes::Reachable::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Reachable", 1, value); } - case Basic::Attributes::UniqueID::Id: { + case BasicInformation::Attributes::UniqueID::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("UniqueID", 1, value); } - case Basic::Attributes::CapabilityMinima::Id: { - chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType value; + case BasicInformation::Attributes::CapabilityMinima::Id: { + chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CapabilityMinima", 1, value); } - case Basic::Attributes::GeneratedCommandList::Id: { + case BasicInformation::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case Basic::Attributes::AcceptedCommandList::Id: { + case BasicInformation::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case Basic::Attributes::AttributeList::Id: { + case BasicInformation::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case Basic::Attributes::FeatureMap::Id: { + case BasicInformation::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case Basic::Attributes::ClusterRevision::Id: { + case BasicInformation::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -9563,443 +9600,443 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case TestCluster::Id: { + case UnitTesting::Id: { switch (path.mAttributeId) { - case TestCluster::Attributes::Boolean::Id: { + case UnitTesting::Attributes::Boolean::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("boolean", 1, value); } - case TestCluster::Attributes::Bitmap8::Id: { - chip::BitMask value; + case UnitTesting::Attributes::Bitmap8::Id: { + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("bitmap8", 1, value); } - case TestCluster::Attributes::Bitmap16::Id: { - chip::BitMask value; + case UnitTesting::Attributes::Bitmap16::Id: { + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("bitmap16", 1, value); } - case TestCluster::Attributes::Bitmap32::Id: { - chip::BitMask value; + case UnitTesting::Attributes::Bitmap32::Id: { + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("bitmap32", 1, value); } - case TestCluster::Attributes::Bitmap64::Id: { - chip::BitMask value; + case UnitTesting::Attributes::Bitmap64::Id: { + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("bitmap64", 1, value); } - case TestCluster::Attributes::Int8u::Id: { + case UnitTesting::Attributes::Int8u::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int8u", 1, value); } - case TestCluster::Attributes::Int16u::Id: { + case UnitTesting::Attributes::Int16u::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int16u", 1, value); } - case TestCluster::Attributes::Int24u::Id: { + case UnitTesting::Attributes::Int24u::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int24u", 1, value); } - case TestCluster::Attributes::Int32u::Id: { + case UnitTesting::Attributes::Int32u::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int32u", 1, value); } - case TestCluster::Attributes::Int40u::Id: { + case UnitTesting::Attributes::Int40u::Id: { uint64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int40u", 1, value); } - case TestCluster::Attributes::Int48u::Id: { + case UnitTesting::Attributes::Int48u::Id: { uint64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int48u", 1, value); } - case TestCluster::Attributes::Int56u::Id: { + case UnitTesting::Attributes::Int56u::Id: { uint64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int56u", 1, value); } - case TestCluster::Attributes::Int64u::Id: { + case UnitTesting::Attributes::Int64u::Id: { uint64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int64u", 1, value); } - case TestCluster::Attributes::Int8s::Id: { + case UnitTesting::Attributes::Int8s::Id: { int8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int8s", 1, value); } - case TestCluster::Attributes::Int16s::Id: { + case UnitTesting::Attributes::Int16s::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int16s", 1, value); } - case TestCluster::Attributes::Int24s::Id: { + case UnitTesting::Attributes::Int24s::Id: { int32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int24s", 1, value); } - case TestCluster::Attributes::Int32s::Id: { + case UnitTesting::Attributes::Int32s::Id: { int32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int32s", 1, value); } - case TestCluster::Attributes::Int40s::Id: { + case UnitTesting::Attributes::Int40s::Id: { int64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int40s", 1, value); } - case TestCluster::Attributes::Int48s::Id: { + case UnitTesting::Attributes::Int48s::Id: { int64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int48s", 1, value); } - case TestCluster::Attributes::Int56s::Id: { + case UnitTesting::Attributes::Int56s::Id: { int64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int56s", 1, value); } - case TestCluster::Attributes::Int64s::Id: { + case UnitTesting::Attributes::Int64s::Id: { int64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("int64s", 1, value); } - case TestCluster::Attributes::Enum8::Id: { + case UnitTesting::Attributes::Enum8::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("enum8", 1, value); } - case TestCluster::Attributes::Enum16::Id: { + case UnitTesting::Attributes::Enum16::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("enum16", 1, value); } - case TestCluster::Attributes::FloatSingle::Id: { + case UnitTesting::Attributes::FloatSingle::Id: { float value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("float_single", 1, value); } - case TestCluster::Attributes::FloatDouble::Id: { + case UnitTesting::Attributes::FloatDouble::Id: { double value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("float_double", 1, value); } - case TestCluster::Attributes::OctetString::Id: { + case UnitTesting::Attributes::OctetString::Id: { chip::ByteSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("octet_string", 1, value); } - case TestCluster::Attributes::ListInt8u::Id: { + case UnitTesting::Attributes::ListInt8u::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_int8u", 1, value); } - case TestCluster::Attributes::ListOctetString::Id: { + case UnitTesting::Attributes::ListOctetString::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_octet_string", 1, value); } - case TestCluster::Attributes::ListStructOctetString::Id: { - chip::app::DataModel::DecodableList + case UnitTesting::Attributes::ListStructOctetString::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_struct_octet_string", 1, value); } - case TestCluster::Attributes::LongOctetString::Id: { + case UnitTesting::Attributes::LongOctetString::Id: { chip::ByteSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("long_octet_string", 1, value); } - case TestCluster::Attributes::CharString::Id: { + case UnitTesting::Attributes::CharString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("char_string", 1, value); } - case TestCluster::Attributes::LongCharString::Id: { + case UnitTesting::Attributes::LongCharString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("long_char_string", 1, value); } - case TestCluster::Attributes::EpochUs::Id: { + case UnitTesting::Attributes::EpochUs::Id: { uint64_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("epoch_us", 1, value); } - case TestCluster::Attributes::EpochS::Id: { + case UnitTesting::Attributes::EpochS::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("epoch_s", 1, value); } - case TestCluster::Attributes::VendorId::Id: { + case UnitTesting::Attributes::VendorId::Id: { chip::VendorId value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("vendor_id", 1, value); } - case TestCluster::Attributes::ListNullablesAndOptionalsStruct::Id: { + case UnitTesting::Attributes::ListNullablesAndOptionalsStruct::Id: { chip::app::DataModel::DecodableList< - chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> + chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_nullables_and_optionals_struct", 1, value); } - case TestCluster::Attributes::EnumAttr::Id: { - chip::app::Clusters::TestCluster::SimpleEnum value; + case UnitTesting::Attributes::EnumAttr::Id: { + chip::app::Clusters::UnitTesting::SimpleEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("enum_attr", 1, value); } - case TestCluster::Attributes::StructAttr::Id: { - chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType value; + case UnitTesting::Attributes::StructAttr::Id: { + chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("struct_attr", 1, value); } - case TestCluster::Attributes::RangeRestrictedInt8u::Id: { + case UnitTesting::Attributes::RangeRestrictedInt8u::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("range_restricted_int8u", 1, value); } - case TestCluster::Attributes::RangeRestrictedInt8s::Id: { + case UnitTesting::Attributes::RangeRestrictedInt8s::Id: { int8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("range_restricted_int8s", 1, value); } - case TestCluster::Attributes::RangeRestrictedInt16u::Id: { + case UnitTesting::Attributes::RangeRestrictedInt16u::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("range_restricted_int16u", 1, value); } - case TestCluster::Attributes::RangeRestrictedInt16s::Id: { + case UnitTesting::Attributes::RangeRestrictedInt16s::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("range_restricted_int16s", 1, value); } - case TestCluster::Attributes::ListLongOctetString::Id: { + case UnitTesting::Attributes::ListLongOctetString::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_long_octet_string", 1, value); } - case TestCluster::Attributes::ListFabricScoped::Id: { - chip::app::DataModel::DecodableList value; + case UnitTesting::Attributes::ListFabricScoped::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("list_fabric_scoped", 1, value); } - case TestCluster::Attributes::TimedWriteBoolean::Id: { + case UnitTesting::Attributes::TimedWriteBoolean::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("timed_write_boolean", 1, value); } - case TestCluster::Attributes::GeneralErrorBoolean::Id: { + case UnitTesting::Attributes::GeneralErrorBoolean::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("general_error_boolean", 1, value); } - case TestCluster::Attributes::ClusterErrorBoolean::Id: { + case UnitTesting::Attributes::ClusterErrorBoolean::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("cluster_error_boolean", 1, value); } - case TestCluster::Attributes::Unsupported::Id: { + case UnitTesting::Attributes::Unsupported::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("unsupported", 1, value); } - case TestCluster::Attributes::NullableBoolean::Id: { + case UnitTesting::Attributes::NullableBoolean::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_boolean", 1, value); } - case TestCluster::Attributes::NullableBitmap8::Id: { - chip::app::DataModel::Nullable> value; + case UnitTesting::Attributes::NullableBitmap8::Id: { + chip::app::DataModel::Nullable> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_bitmap8", 1, value); } - case TestCluster::Attributes::NullableBitmap16::Id: { - chip::app::DataModel::Nullable> value; + case UnitTesting::Attributes::NullableBitmap16::Id: { + chip::app::DataModel::Nullable> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_bitmap16", 1, value); } - case TestCluster::Attributes::NullableBitmap32::Id: { - chip::app::DataModel::Nullable> value; + case UnitTesting::Attributes::NullableBitmap32::Id: { + chip::app::DataModel::Nullable> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_bitmap32", 1, value); } - case TestCluster::Attributes::NullableBitmap64::Id: { - chip::app::DataModel::Nullable> value; + case UnitTesting::Attributes::NullableBitmap64::Id: { + chip::app::DataModel::Nullable> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_bitmap64", 1, value); } - case TestCluster::Attributes::NullableInt8u::Id: { + case UnitTesting::Attributes::NullableInt8u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int8u", 1, value); } - case TestCluster::Attributes::NullableInt16u::Id: { + case UnitTesting::Attributes::NullableInt16u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int16u", 1, value); } - case TestCluster::Attributes::NullableInt24u::Id: { + case UnitTesting::Attributes::NullableInt24u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int24u", 1, value); } - case TestCluster::Attributes::NullableInt32u::Id: { + case UnitTesting::Attributes::NullableInt32u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int32u", 1, value); } - case TestCluster::Attributes::NullableInt40u::Id: { + case UnitTesting::Attributes::NullableInt40u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int40u", 1, value); } - case TestCluster::Attributes::NullableInt48u::Id: { + case UnitTesting::Attributes::NullableInt48u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int48u", 1, value); } - case TestCluster::Attributes::NullableInt56u::Id: { + case UnitTesting::Attributes::NullableInt56u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int56u", 1, value); } - case TestCluster::Attributes::NullableInt64u::Id: { + case UnitTesting::Attributes::NullableInt64u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int64u", 1, value); } - case TestCluster::Attributes::NullableInt8s::Id: { + case UnitTesting::Attributes::NullableInt8s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int8s", 1, value); } - case TestCluster::Attributes::NullableInt16s::Id: { + case UnitTesting::Attributes::NullableInt16s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int16s", 1, value); } - case TestCluster::Attributes::NullableInt24s::Id: { + case UnitTesting::Attributes::NullableInt24s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int24s", 1, value); } - case TestCluster::Attributes::NullableInt32s::Id: { + case UnitTesting::Attributes::NullableInt32s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int32s", 1, value); } - case TestCluster::Attributes::NullableInt40s::Id: { + case UnitTesting::Attributes::NullableInt40s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int40s", 1, value); } - case TestCluster::Attributes::NullableInt48s::Id: { + case UnitTesting::Attributes::NullableInt48s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int48s", 1, value); } - case TestCluster::Attributes::NullableInt56s::Id: { + case UnitTesting::Attributes::NullableInt56s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int56s", 1, value); } - case TestCluster::Attributes::NullableInt64s::Id: { + case UnitTesting::Attributes::NullableInt64s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_int64s", 1, value); } - case TestCluster::Attributes::NullableEnum8::Id: { + case UnitTesting::Attributes::NullableEnum8::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_enum8", 1, value); } - case TestCluster::Attributes::NullableEnum16::Id: { + case UnitTesting::Attributes::NullableEnum16::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_enum16", 1, value); } - case TestCluster::Attributes::NullableFloatSingle::Id: { + case UnitTesting::Attributes::NullableFloatSingle::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_float_single", 1, value); } - case TestCluster::Attributes::NullableFloatDouble::Id: { + case UnitTesting::Attributes::NullableFloatDouble::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_float_double", 1, value); } - case TestCluster::Attributes::NullableOctetString::Id: { + case UnitTesting::Attributes::NullableOctetString::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_octet_string", 1, value); } - case TestCluster::Attributes::NullableCharString::Id: { + case UnitTesting::Attributes::NullableCharString::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_char_string", 1, value); } - case TestCluster::Attributes::NullableEnumAttr::Id: { - chip::app::DataModel::Nullable value; + case UnitTesting::Attributes::NullableEnumAttr::Id: { + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_enum_attr", 1, value); } - case TestCluster::Attributes::NullableStruct::Id: { - chip::app::DataModel::Nullable value; + case UnitTesting::Attributes::NullableStruct::Id: { + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_struct", 1, value); } - case TestCluster::Attributes::NullableRangeRestrictedInt8u::Id: { + case UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_range_restricted_int8u", 1, value); } - case TestCluster::Attributes::NullableRangeRestrictedInt8s::Id: { + case UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_range_restricted_int8s", 1, value); } - case TestCluster::Attributes::NullableRangeRestrictedInt16u::Id: { + case UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_range_restricted_int16u", 1, value); } - case TestCluster::Attributes::NullableRangeRestrictedInt16s::Id: { + case UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("nullable_range_restricted_int16s", 1, value); } - case TestCluster::Attributes::WriteOnlyInt8u::Id: { + case UnitTesting::Attributes::WriteOnlyInt8u::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("write_only_int8u", 1, value); } - case TestCluster::Attributes::GeneratedCommandList::Id: { + case UnitTesting::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case TestCluster::Attributes::AcceptedCommandList::Id: { + case UnitTesting::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case TestCluster::Attributes::AttributeList::Id: { + case UnitTesting::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case TestCluster::Attributes::FeatureMap::Id: { + case UnitTesting::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case TestCluster::Attributes::ClusterRevision::Id: { + case UnitTesting::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -10349,66 +10386,66 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa } break; } - case TestCluster::Id: { + case UnitTesting::Id: { switch (path.mCommandId) { - case TestCluster::Commands::TestSpecificResponse::Id: { - TestCluster::Commands::TestSpecificResponse::DecodableType value; + case UnitTesting::Commands::TestSpecificResponse::Id: { + UnitTesting::Commands::TestSpecificResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestSpecificResponse", 1, value); } - case TestCluster::Commands::TestAddArgumentsResponse::Id: { - TestCluster::Commands::TestAddArgumentsResponse::DecodableType value; + case UnitTesting::Commands::TestAddArgumentsResponse::Id: { + UnitTesting::Commands::TestAddArgumentsResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestAddArgumentsResponse", 1, value); } - case TestCluster::Commands::TestSimpleArgumentResponse::Id: { - TestCluster::Commands::TestSimpleArgumentResponse::DecodableType value; + case UnitTesting::Commands::TestSimpleArgumentResponse::Id: { + UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestSimpleArgumentResponse", 1, value); } - case TestCluster::Commands::TestStructArrayArgumentResponse::Id: { - TestCluster::Commands::TestStructArrayArgumentResponse::DecodableType value; + case UnitTesting::Commands::TestStructArrayArgumentResponse::Id: { + UnitTesting::Commands::TestStructArrayArgumentResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestStructArrayArgumentResponse", 1, value); } - case TestCluster::Commands::TestListInt8UReverseResponse::Id: { - TestCluster::Commands::TestListInt8UReverseResponse::DecodableType value; + case UnitTesting::Commands::TestListInt8UReverseResponse::Id: { + UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestListInt8UReverseResponse", 1, value); } - case TestCluster::Commands::TestEnumsResponse::Id: { - TestCluster::Commands::TestEnumsResponse::DecodableType value; + case UnitTesting::Commands::TestEnumsResponse::Id: { + UnitTesting::Commands::TestEnumsResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestEnumsResponse", 1, value); } - case TestCluster::Commands::TestNullableOptionalResponse::Id: { - TestCluster::Commands::TestNullableOptionalResponse::DecodableType value; + case UnitTesting::Commands::TestNullableOptionalResponse::Id: { + UnitTesting::Commands::TestNullableOptionalResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestNullableOptionalResponse", 1, value); } - case TestCluster::Commands::TestComplexNullableOptionalResponse::Id: { - TestCluster::Commands::TestComplexNullableOptionalResponse::DecodableType value; + case UnitTesting::Commands::TestComplexNullableOptionalResponse::Id: { + UnitTesting::Commands::TestComplexNullableOptionalResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestComplexNullableOptionalResponse", 1, value); } - case TestCluster::Commands::BooleanResponse::Id: { - TestCluster::Commands::BooleanResponse::DecodableType value; + case UnitTesting::Commands::BooleanResponse::Id: { + UnitTesting::Commands::BooleanResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("BooleanResponse", 1, value); } - case TestCluster::Commands::SimpleStructResponse::Id: { - TestCluster::Commands::SimpleStructResponse::DecodableType value; + case UnitTesting::Commands::SimpleStructResponse::Id: { + UnitTesting::Commands::SimpleStructResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SimpleStructResponse", 1, value); } - case TestCluster::Commands::TestEmitTestEventResponse::Id: { - TestCluster::Commands::TestEmitTestEventResponse::DecodableType value; + case UnitTesting::Commands::TestEmitTestEventResponse::Id: { + UnitTesting::Commands::TestEmitTestEventResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestEmitTestEventResponse", 1, value); } - case TestCluster::Commands::TestEmitTestFabricScopedEventResponse::Id: { - TestCluster::Commands::TestEmitTestFabricScopedEventResponse::DecodableType value; + case UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::Id: { + UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestEmitTestFabricScopedEventResponse", 1, value); } @@ -10482,26 +10519,26 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip } break; } - case Basic::Id: { + case BasicInformation::Id: { switch (header.mPath.mEventId) { - case Basic::Events::StartUp::Id: { - chip::app::Clusters::Basic::Events::StartUp::DecodableType value; + case BasicInformation::Events::StartUp::Id: { + chip::app::Clusters::BasicInformation::Events::StartUp::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUp", 1, value); } - case Basic::Events::ShutDown::Id: { - chip::app::Clusters::Basic::Events::ShutDown::DecodableType value; + case BasicInformation::Events::ShutDown::Id: { + chip::app::Clusters::BasicInformation::Events::ShutDown::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ShutDown", 1, value); } - case Basic::Events::Leave::Id: { - chip::app::Clusters::Basic::Events::Leave::DecodableType value; + case BasicInformation::Events::Leave::Id: { + chip::app::Clusters::BasicInformation::Events::Leave::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Leave", 1, value); } - case Basic::Events::ReachableChanged::Id: { - chip::app::Clusters::Basic::Events::ReachableChanged::DecodableType value; + case BasicInformation::Events::ReachableChanged::Id: { + chip::app::Clusters::BasicInformation::Events::ReachableChanged::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ReachableChanged", 1, value); } @@ -10803,16 +10840,16 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip } break; } - case TestCluster::Id: { + case UnitTesting::Id: { switch (header.mPath.mEventId) { - case TestCluster::Events::TestEvent::Id: { - chip::app::Clusters::TestCluster::Events::TestEvent::DecodableType value; + case UnitTesting::Events::TestEvent::Id: { + chip::app::Clusters::UnitTesting::Events::TestEvent::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestEvent", 1, value); } - case TestCluster::Events::TestFabricScopedEvent::Id: { - chip::app::Clusters::TestCluster::Events::TestFabricScopedEvent::DecodableType value; + case UnitTesting::Events::TestFabricScopedEvent::Id: { + chip::app::Clusters::UnitTesting::Events::TestFabricScopedEvent::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("TestFabricScopedEvent", 1, value); } diff --git a/components/esp_matter_controller/logger/zap-generated/DataModelLogger.h b/components/esp_matter_controller/logger/zap-generated/DataModelLogger.h index ca89b8ba3..26136d48f 100644 --- a/components/esp_matter_controller/logger/zap-generated/DataModelLogger.h +++ b/components/esp_matter_controller/logger/zap-generated/DataModelLogger.h @@ -44,7 +44,7 @@ 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); 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, const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); 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, const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value); 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, const chip::app::Clusters::TimeSynchronization::Structs::DstOffsetType::DecodableType & value); 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); static CHIP_ERROR LogValue(const char * label, size_t indent, 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, const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType & value); 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, - 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, const chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType & value); 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 LogValue(const char * label, size_t indent, 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, const chip::app::Clusters::ModeSelect::Structs::SemanticTag::DecodableType & value); 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, const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value); 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, const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value); 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, - 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, const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value); 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, const chip::app::Clusters::Actions::Events::ActionFailed::DecodableType & value); 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, - 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, - 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, - 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, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Events::StateTransition::DecodableType & value); 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, const chip::app::Clusters::PumpConfigurationAndControl::Events::TurbineOperation::DecodableType & value); 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, - 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, const chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & value); @@ -363,29 +365,29 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & value); 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, - 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, - const chip::app::Clusters::TestCluster::Commands::TestSimpleArgumentResponse::DecodableType & value); + const chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::DecodableType & value); static CHIP_ERROR 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, - 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, - 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, - const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType & value); + const chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::DecodableType & value); static CHIP_ERROR 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, - 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, - 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, - const chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType & value); + const chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::DecodableType & value); static CHIP_ERROR 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); diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip index 87bee4de2..ca086f2f3 160000 --- a/connectedhomeip/connectedhomeip +++ b/connectedhomeip/connectedhomeip @@ -1 +1 @@ -Subproject commit 87bee4de25886ba00f1a177cd0f8791a48528a1f +Subproject commit ca086f2f397fc4128f4964afb17433377e01faf4 diff --git a/examples/blemesh_bridge/main/zap-generated/PluginApplicationCallbacks.h b/examples/blemesh_bridge/main/zap-generated/PluginApplicationCallbacks.h deleted file mode 100644 index 3fb313fc9..000000000 --- a/examples/blemesh_bridge/main/zap-generated/PluginApplicationCallbacks.h +++ /dev/null @@ -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 - -#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common(); diff --git a/examples/blemesh_bridge/platform/ESP32_custom/BUILD.gn b/examples/blemesh_bridge/platform/ESP32_custom/BUILD.gn index f20f8d4ac..4e4e4430f 100644 --- a/examples/blemesh_bridge/platform/ESP32_custom/BUILD.gn +++ b/examples/blemesh_bridge/platform/ESP32_custom/BUILD.gn @@ -82,8 +82,6 @@ static_library("ESP32_custom") { "ConfigurationManagerImpl.h", "ConnectivityManagerImpl.cpp", "ConnectivityManagerImpl.h", - "DeviceNetworkProvisioningDelegateImpl.cpp", - "DeviceNetworkProvisioningDelegateImpl.h", "DiagnosticDataProviderImpl.cpp", "DiagnosticDataProviderImpl.h", "ESP32Config.cpp", diff --git a/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.cpp b/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.cpp deleted file mode 120000 index 2440f220f..000000000 --- a/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp \ No newline at end of file diff --git a/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.h b/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.h deleted file mode 120000 index b1ebe37f0..000000000 --- a/examples/blemesh_bridge/platform/ESP32_custom/DeviceNetworkProvisioningDelegateImpl.h +++ /dev/null @@ -1 +0,0 @@ -../../../../connectedhomeip/connectedhomeip/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h \ No newline at end of file diff --git a/examples/common/external_platform/BUILD.gn b/examples/common/external_platform/BUILD.gn index e8a5c8d66..a1c2d4119 100644 --- a/examples/common/external_platform/BUILD.gn +++ b/examples/common/external_platform/BUILD.gn @@ -79,8 +79,6 @@ static_library("ESP32_custom") { "ConfigurationManagerImpl.h", "ConnectivityManagerImpl.cpp", "ConnectivityManagerImpl.h", - "DeviceNetworkProvisioningDelegateImpl.cpp", - "DeviceNetworkProvisioningDelegateImpl.h", "DiagnosticDataProviderImpl.cpp", "DiagnosticDataProviderImpl.h", "ESP32Config.cpp", diff --git a/examples/generic_switch/sdkconfig.defaults b/examples/generic_switch/sdkconfig.defaults index b9e7c2afa..14f02abb5 100644 --- a/examples/generic_switch/sdkconfig.defaults +++ b/examples/generic_switch/sdkconfig.defaults @@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +#disable BT connection reattempt +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n + #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y diff --git a/examples/light/main/zap-generated/PluginApplicationCallbacks.h b/examples/light/main/zap-generated/PluginApplicationCallbacks.h deleted file mode 100644 index 3fb313fc9..000000000 --- a/examples/light/main/zap-generated/PluginApplicationCallbacks.h +++ /dev/null @@ -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 - -#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common(); diff --git a/examples/light/sdkconfig.defaults b/examples/light/sdkconfig.defaults index 75e4efc4b..1fa8a9ff4 100644 --- a/examples/light/sdkconfig.defaults +++ b/examples/light/sdkconfig.defaults @@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +#disable BT connection reattempt +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n + #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y diff --git a/examples/light/sdkconfig.defaults.ext_plat_ci b/examples/light/sdkconfig.defaults.ext_plat_ci index ea18b3451..448aea7fd 100644 --- a/examples/light/sdkconfig.defaults.ext_plat_ci +++ b/examples/light/sdkconfig.defaults.ext_plat_ci @@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +#disable BT connection reattempt +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n + #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y diff --git a/examples/light_switch/main/zap-generated/PluginApplicationCallbacks.h b/examples/light_switch/main/zap-generated/PluginApplicationCallbacks.h deleted file mode 100644 index 3fb313fc9..000000000 --- a/examples/light_switch/main/zap-generated/PluginApplicationCallbacks.h +++ /dev/null @@ -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 - -#define MATTER_PLUGINS_INIT esp_matter::cluster::plugin_init_callback_common(); diff --git a/examples/light_switch/sdkconfig.defaults b/examples/light_switch/sdkconfig.defaults index 75e4efc4b..1fa8a9ff4 100644 --- a/examples/light_switch/sdkconfig.defaults +++ b/examples/light_switch/sdkconfig.defaults @@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +#disable BT connection reattempt +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n + #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y diff --git a/examples/zap_light/main/zap-generated/PluginApplicationCallbacks.h b/examples/zap_light/main/zap-generated/PluginApplicationCallbacks.h index fddb4d6e6..935de8bba 100644 --- a/examples/zap_light/main/zap-generated/PluginApplicationCallbacks.h +++ b/examples/zap_light/main/zap-generated/PluginApplicationCallbacks.h @@ -19,8 +19,6 @@ #pragma once -#include - #define MATTER_PLUGINS_INIT \ MatterIdentifyPluginServerInitCallback(); \ MatterGroupsPluginServerInitCallback(); \ @@ -28,7 +26,7 @@ MatterLevelControlPluginServerInitCallback(); \ MatterDescriptorPluginServerInitCallback(); \ MatterAccessControlPluginServerInitCallback(); \ - MatterBasicPluginServerInitCallback(); \ + MatterBasicInformationPluginServerInitCallback(); \ MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \ MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); \ MatterLocalizationConfigurationPluginServerInitCallback(); \ diff --git a/examples/zap_light/main/zap-generated/access.h b/examples/zap_light/main/zap-generated/access.h index 9bec66ae0..0b7fcd5e6 100644 --- a/examples/zap_light/main/zap-generated/access.h +++ b/examples/zap_light/main/zap-generated/access.h @@ -36,9 +36,9 @@ /* Cluster: Access Control, Attribute: SubjectsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ - /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ - /* Cluster: Basic, Attribute: Location, Privilege: view */ \ - /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ 49, /* Cluster: Network Commissioning, Attribute: MaxNetworks, 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: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ - /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ - /* Cluster: Basic, Attribute: Location, Privilege: view */ \ - /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ 0, /* Cluster: Network Commissioning, Attribute: MaxNetworks, 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: TargetsPerAccessControlEntry, Privilege: view */ \ /* Cluster: Access Control, Attribute: AccessControlEntriesPerFabric, Privilege: view */ \ - /* Cluster: Basic, Attribute: NodeLabel, Privilege: view */ \ - /* Cluster: Basic, Attribute: Location, Privilege: view */ \ - /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: Location, Privilege: view */ \ + /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: view */ \ /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: view */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \ @@ -110,9 +110,9 @@ 8, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ 31, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 31, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ - 40, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ - 40, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ - 40, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ + 40, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \ + 40, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \ + 40, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \ 48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ @@ -126,9 +126,9 @@ 16384, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ 0, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ 1, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ - 5, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ - 6, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ - 16, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ + 5, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \ + 6, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \ + 16, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \ 0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ 0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ @@ -142,9 +142,9 @@ kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \ - kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: NodeLabel, Privilege: manage */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: Basic, Attribute: Location, Privilege: administer */ \ - kMatterAccessPrivilegeManage, /* Cluster: Basic, Attribute: LocalConfigDisabled, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \ + kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ diff --git a/examples/zap_light/main/zap-generated/callback-stub.cpp b/examples/zap_light/main/zap-generated/callback-stub.cpp index 208502678..edaf1f292 100644 --- a/examples/zap_light/main/zap-generated/callback-stub.cpp +++ b/examples/zap_light/main/zap-generated/callback-stub.cpp @@ -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 -#include +#include #include #include @@ -29,85 +10,85 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) { switch (clusterId) { - case ZCL_ACCESS_CONTROL_CLUSTER_ID: + case app::Clusters::AccessControl::Id: emberAfAccessControlClusterInitCallback(endpoint); break; - case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID: + case app::Clusters::AdministratorCommissioning::Id: emberAfAdministratorCommissioningClusterInitCallback(endpoint); break; - case ZCL_BASIC_CLUSTER_ID: - emberAfBasicClusterInitCallback(endpoint); + case app::Clusters::BasicInformation::Id: + emberAfBasicInformationClusterInitCallback(endpoint); break; - case ZCL_COLOR_CONTROL_CLUSTER_ID: + case app::Clusters::ColorControl::Id: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_DESCRIPTOR_CLUSTER_ID: + case app::Clusters::Descriptor::Id: emberAfDescriptorClusterInitCallback(endpoint); break; - case ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID: + case app::Clusters::DiagnosticLogs::Id: emberAfDiagnosticLogsClusterInitCallback(endpoint); break; - case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID: + case app::Clusters::EthernetNetworkDiagnostics::Id: emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint); break; - case ZCL_FIXED_LABEL_CLUSTER_ID: + case app::Clusters::FixedLabel::Id: emberAfFixedLabelClusterInitCallback(endpoint); break; - case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID: + case app::Clusters::GeneralCommissioning::Id: emberAfGeneralCommissioningClusterInitCallback(endpoint); break; - case ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID: + case app::Clusters::GeneralDiagnostics::Id: emberAfGeneralDiagnosticsClusterInitCallback(endpoint); break; - case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID: + case app::Clusters::GroupKeyManagement::Id: emberAfGroupKeyManagementClusterInitCallback(endpoint); break; - case ZCL_GROUPS_CLUSTER_ID: + case app::Clusters::Groups::Id: emberAfGroupsClusterInitCallback(endpoint); break; - case ZCL_IDENTIFY_CLUSTER_ID: + case app::Clusters::Identify::Id: emberAfIdentifyClusterInitCallback(endpoint); break; - case ZCL_LEVEL_CONTROL_CLUSTER_ID: + case app::Clusters::LevelControl::Id: emberAfLevelControlClusterInitCallback(endpoint); break; - case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID: + case app::Clusters::LocalizationConfiguration::Id: emberAfLocalizationConfigurationClusterInitCallback(endpoint); break; - case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: + case app::Clusters::NetworkCommissioning::Id: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: - emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); - break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: - emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); - break; - case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: + case app::Clusters::OccupancySensing::Id: emberAfOccupancySensingClusterInitCallback(endpoint); break; - case ZCL_ON_OFF_CLUSTER_ID: + case app::Clusters::OnOff::Id: emberAfOnOffClusterInitCallback(endpoint); break; - case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: + case app::Clusters::OperationalCredentials::Id: emberAfOperationalCredentialsClusterInitCallback(endpoint); 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); break; - case ZCL_SWITCH_CLUSTER_ID: + case app::Clusters::Switch::Id: emberAfSwitchClusterInitCallback(endpoint); break; - case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID: + case app::Clusters::ThreadNetworkDiagnostics::Id: emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint); break; - case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID: + case app::Clusters::TimeFormatLocalization::Id: emberAfTimeFormatLocalizationClusterInitCallback(endpoint); break; - case ZCL_USER_LABEL_CLUSTER_ID: + case app::Clusters::UserLabel::Id: emberAfUserLabelClusterInitCallback(endpoint); break; - case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID: + case app::Clusters::WiFiNetworkDiagnostics::Id: emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint); break; default: @@ -115,7 +96,6 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) break; } } - void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint) { // To prevent warning @@ -126,7 +106,7 @@ void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback( // To prevent warning (void) endpoint; } -void __attribute__((weak)) emberAfBasicClusterInitCallback(EndpointId endpoint) +void __attribute__((weak)) emberAfBasicInformationClusterInitCallback(EndpointId endpoint) { // To prevent warning (void) endpoint; @@ -196,16 +176,6 @@ void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(Endpoi // To prevent warning (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) { // To prevent warning @@ -221,6 +191,16 @@ void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(Endp // To prevent warning (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) { // To prevent warning @@ -251,93 +231,3 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp // To prevent warning (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) -{} diff --git a/examples/zap_light/main/zap-generated/endpoint_config.h b/examples/zap_light/main/zap-generated/endpoint_config.h index 512780c8a..9bfeaaf0c 100644 --- a/examples/zap_light/main/zap-generated/endpoint_config.h +++ b/examples/zap_light/main/zap-generated/endpoint_config.h @@ -104,7 +104,7 @@ { \ \ /* 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 */ \ { 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 */ \ { 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), \ ZAP_EMPTY_DEFAULT() }, /* DataModelRevision */ \ { 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 */ \ \ /* 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 */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ \ @@ -556,9 +556,6 @@ const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = { \ (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback, \ }; \ - const EmberAfGenericClusterFunction chipFuncArrayBasicServer[] = { \ - (EmberAfGenericClusterFunction) emberAfBasicClusterServerInitCallback, \ - }; \ const EmberAfGenericClusterFunction chipFuncArrayLocalizationConfigurationServer[] = { \ (EmberAfGenericClusterFunction) emberAfLocalizationConfigurationClusterServerInitCallback, \ (EmberAfGenericClusterFunction) MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback, \ @@ -796,13 +793,13 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 0, Cluster: Basic (server) */ \ + /* Endpoint: 0, Cluster: Basic Information (server) */ \ .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(16), \ .attributeCount = 22, \ .clusterSize = 41, \ - .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ - .functions = chipFuncArrayBasicServer, \ + .mask = ZAP_CLUSTER_MASK(SERVER), \ + .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ },\ diff --git a/examples/zap_light/main/zap-generated/gen_config.h b/examples/zap_light/main/zap-generated/gen_config.h index 6460a2243..65903e997 100644 --- a/examples/zap_light/main/zap-generated/gen_config.h +++ b/examples/zap_light/main/zap-generated/gen_config.h @@ -35,9 +35,9 @@ #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_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_TIME_FORMAT_LOCALIZATION_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 -// Use this macro to check if the server side of the Basic cluster is included -#define ZCL_USING_BASIC_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BASIC_SERVER -#define EMBER_AF_PLUGIN_BASIC +// Use this macro to check if the server side of the Basic Information cluster is included +#define ZCL_USING_BASIC_INFORMATION_CLUSTER_SERVER +#define EMBER_AF_PLUGIN_BASIC_INFORMATION_SERVER +#define EMBER_AF_PLUGIN_BASIC_INFORMATION // 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 // 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 diff --git a/examples/zap_light/main/zap-generated/gen_tokens.h b/examples/zap_light/main/zap-generated/gen_tokens.h deleted file mode 100644 index dcc229f5b..000000000 --- a/examples/zap_light/main/zap-generated/gen_tokens.h +++ /dev/null @@ -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) diff --git a/examples/zap_light/sdkconfig.defaults b/examples/zap_light/sdkconfig.defaults index b9e7c2afa..14f02abb5 100644 --- a/examples/zap_light/sdkconfig.defaults +++ b/examples/zap_light/sdkconfig.defaults @@ -10,6 +10,9 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +#disable BT connection reattempt +CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n + #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y