diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt index e7f2686627524c..9245b0c6d8f171 100644 --- a/.github/.wordlist.txt +++ b/.github/.wordlist.txt @@ -159,7 +159,7 @@ bouffalolab BRD breakpoint bredr -BridgedDeviceBasic +BridgedDeviceBasicInformation bridgedLightEndpoint bringup BromateConcentrationMeasurement diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4231e7b0decea0..5caf143d66436e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -120,7 +120,7 @@ jobs: src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml \ + src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \ src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \ src/app/zap-templates/zcl/data-model/chip/chip-types.xml \ src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \ diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md index 9bd6a4a095d612..7edbede54057ae 100644 --- a/docs/guides/python_chip_controller_building.md +++ b/docs/guides/python_chip_controller_building.md @@ -517,7 +517,7 @@ AudioOutput BarrierControl BasicInformation Binding -BridgedDeviceBasic +BridgedDeviceBasicInformation ColorControl ContentLaunch Descriptor diff --git a/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb b/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb index 48cac23fe3434b..12427060a4c542 100644 --- a/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb +++ b/docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb @@ -1805,8 +1805,8 @@ "│ │ │ <class 'chip.clusters.Objects.NetworkCommissioning.Attributes.FeatureMap'>: 0,\n", "│ │ │ <class 'chip.clusters.Objects.NetworkCommissioning.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", - "│ │ <class 'chip.clusters.Objects.BridgedDeviceBasic'>: {\n", - "│ │ │ <class 'chip.clusters.Objects.BridgedDeviceBasic.Attributes.ClusterRevision'>: 1\n", + "│ │ <class 'chip.clusters.Objects.BridgedDeviceBasicInformation'>: {\n", + "│ │ │ <class 'chip.clusters.Objects.BridgedDeviceBasicInformation.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", "│ │ <class 'chip.clusters.Objects.Switch'>: {\n", "│ │ │ <class 'chip.clusters.Objects.Switch.Attributes.NumberOfPositions'>: 2,\n", @@ -2821,8 +2821,8 @@ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.NetworkCommissioning.Attributes.FeatureMap'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m0\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.NetworkCommissioning.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", - "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasic'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", - "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasic.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", + "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasicInformation'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", + "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasicInformation.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Switch'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Switch.Attributes.NumberOfPositions'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m2\u001b[0m,\n", diff --git a/docs/guides/repl/Matter_Basic_Interactions.ipynb b/docs/guides/repl/Matter_Basic_Interactions.ipynb index 12d9224ef48613..f1ca29e36cc6ac 100644 --- a/docs/guides/repl/Matter_Basic_Interactions.ipynb +++ b/docs/guides/repl/Matter_Basic_Interactions.ipynb @@ -1798,8 +1798,8 @@ "│ │ │ <class 'chip.clusters.Objects.NetworkCommissioning.Attributes.FeatureMap'>: 0,\n", "│ │ │ <class 'chip.clusters.Objects.NetworkCommissioning.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", - "│ │ <class 'chip.clusters.Objects.BridgedDeviceBasic'>: {\n", - "│ │ │ <class 'chip.clusters.Objects.BridgedDeviceBasic.Attributes.ClusterRevision'>: 1\n", + "│ │ <class 'chip.clusters.Objects.BridgedDeviceBasicInformation'>: {\n", + "│ │ │ <class 'chip.clusters.Objects.BridgedDeviceBasicInformation.Attributes.ClusterRevision'>: 1\n", "│ │ },\n", "│ │ <class 'chip.clusters.Objects.Switch'>: {\n", "│ │ │ <class 'chip.clusters.Objects.Switch.Attributes.NumberOfPositions'>: 2,\n", @@ -2814,8 +2814,8 @@ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.NetworkCommissioning.Attributes.FeatureMap'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m0\u001b[0m,\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.NetworkCommissioning.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", - "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasic'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", - "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasic.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", + "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasicInformation'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", + "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedDeviceBasicInformation.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n", "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Switch'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n", "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Switch.Attributes.NumberOfPositions'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m2\u001b[0m,\n", diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index dd06b095a17cf7..880cbf5d92676c 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -100,7 +100,7 @@ static Device gLight4("Light 4", "Den"); /* BRIDGED DEVICE ENDPOINT: contains the following clusters: - On/Off - Descriptor - - Bridged Device Basic + - Bridged Device Basic Information */ // Declare On/Off cluster attributes @@ -116,7 +116,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttrib DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); -// Declare Bridged Device Basic information cluster attributes +// Declare Bridged Device Basic Information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(bridgedDeviceBasicAttrs) DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* Reachable */ @@ -138,7 +138,8 @@ constexpr CommandId onOffIncomingCommands[] = { DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedLightClusters) DECLARE_DYNAMIC_CLUSTER(OnOff::Id, onOffAttrs, onOffIncomingCommands, nullptr), DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasic::Id, bridgedDeviceBasicAttrs, nullptr, nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END; + DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, + nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END; // Declare Bridged Light endpoint DECLARE_DYNAMIC_ENDPOINT(bridgedLightEndpoint, bridgedLightClusters); @@ -152,7 +153,7 @@ DataVersion gLight4DataVersions[ArraySize(bridgedLightClusters)]; */ #define ZCL_DESCRIPTOR_CLUSTER_REVISION (1u) -#define ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_REVISION (1u) +#define ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION (1u) #define ZCL_FIXED_LABEL_CLUSTER_REVISION (1u) #define ZCL_ON_OFF_CLUSTER_REVISION (4u) @@ -228,7 +229,7 @@ EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::Attribut } else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) { - *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_REVISION; + *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION; } else { @@ -277,7 +278,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI { Device * dev = gDevices[endpointIndex]; - if (clusterId == BridgedDeviceBasic::Id) + if (clusterId == BridgedDeviceBasicInformation::Id) { return HandleReadBridgedDeviceBasicAttribute(dev, attributeMetadata->attributeId, buffer, maxReadLength); } @@ -327,7 +328,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) { if (itemChangedMask & Device::kChanged_Reachable) { - ScheduleReportingCallback(dev, BridgedDeviceBasic::Id, BridgedDeviceBasic::Attributes::Reachable::Id); + ScheduleReportingCallback(dev, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::Reachable::Id); } if (itemChangedMask & Device::kChanged_State) @@ -337,7 +338,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) if (itemChangedMask & Device::kChanged_Name) { - ScheduleReportingCallback(dev, BridgedDeviceBasic::Id, BridgedDeviceBasic::Attributes::NodeLabel::Id); + ScheduleReportingCallback(dev, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::NodeLabel::Id); } } diff --git a/examples/bridge-app/linux/README.md b/examples/bridge-app/linux/README.md index 83ac848871af20..f9e8c9708b64a0 100644 --- a/examples/bridge-app/linux/README.md +++ b/examples/bridge-app/linux/README.md @@ -87,7 +87,7 @@ clusters as well as the root descriptor cluster. The example demonstrates the use of dynamic endpoints and the concept of adding and removing endpoints at runtime. First, the example declares a `bridgedLightEndpoint` data structure for a Light endpoint with `OnOff`, -`Descriptor`, `BridgedDeviceBasic`, and `FixedLabel` clusters. +`Descriptor`, `BridgedDeviceBasicInformation`, and `FixedLabel` clusters. Using this declared endpoint structure, three endpoints for three bridged lights are dynamically added at endpoint ID's `2`, `3`, and `4`, representing @@ -99,10 +99,10 @@ A fourth light, `Light 4`, is then added occupying endpoint ID `5`. Finally, `Light 2` is re-added, and will occupy endpoint ID `6`. -All endpoints populate the `Bridged Device Basic` and `Fixed Label` clusters. In -the `Bridged Device Basic` cluster, the `reachable` attribute is simulated. In -the `Fixed Label` cluster, the `LabelList` attribute is simulated with the -value/label pair `"room"`/`[light name]`. +All endpoints populate the `Bridged Device Basic Information` and `Fixed Label` +clusters. In the `Bridged Device Basic Information` cluster, the `reachable` +attribute is simulated. In the `Fixed Label` cluster, the `LabelList` attribute +is simulated with the value/label pair `"room"`/`[light name]`. ## Building diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index c7ef75c26d9928..b343f54571c9c5 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -149,7 +149,7 @@ const int16_t initialMeasuredValue = 100; // LIGHT ENDPOINT: contains the following clusters: // - On/Off // - Descriptor -// - Bridged Device Basic +// - Bridged Device Basic Information // Declare On/Off cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(onOffAttrs) @@ -164,7 +164,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttrib DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); -// Declare Bridged Device Basic information cluster attributes +// Declare Bridged Device Basic Information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(bridgedDeviceBasicAttrs) DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* Reachable */ @@ -187,7 +187,8 @@ constexpr CommandId onOffIncomingCommands[] = { DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedLightClusters) DECLARE_DYNAMIC_CLUSTER(OnOff::Id, onOffAttrs, onOffIncomingCommands, nullptr), DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasic::Id, bridgedDeviceBasicAttrs, nullptr, nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END; + DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, + nullptr) DECLARE_DYNAMIC_CLUSTER_LIST_END; // Declare Bridged Light endpoint DECLARE_DYNAMIC_ENDPOINT(bridgedLightEndpoint, bridgedLightClusters); @@ -229,7 +230,7 @@ Action action3(0x1003, "Turn Off Room 1", Actions::ActionTypeEnum::kAutomation, // POWER SOURCE ENDPOINT: contains the following clusters: // - Power Source // - Descriptor -// - Bridged Device Basic +// - Bridged Device Basic Information DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(powerSourceAttrs) DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_BAT_CHARGE_LEVEL_ATTRIBUTE_ID, ENUM8, 1, 0), @@ -239,7 +240,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_BAT_CHARGE_LEVEL_ATTRIBUTE_ID, ENUM8, DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedPowerSourceClusters) DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasic::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), + DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER(PowerSource::Id, powerSourceAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; DECLARE_DYNAMIC_ENDPOINT(bridgedPowerSourceEndpoint, bridgedPowerSourceClusters); @@ -256,11 +257,12 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0), // TEMPERATURE SENSOR ENDPOINT: contains the following clusters: // - Temperature measurement // - Descriptor -// - Bridged Device Basic +// - Bridged Device Basic Information DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedTempSensorClusters) DECLARE_DYNAMIC_CLUSTER(TemperatureMeasurement::Id, tempSensorAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasic::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; + DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), + DECLARE_DYNAMIC_CLUSTER_LIST_END; // Declare Bridged Light endpoint DECLARE_DYNAMIC_ENDPOINT(bridgedTempSensorEndpoint, bridgedTempSensorClusters); @@ -271,12 +273,13 @@ DataVersion gTempSensor2DataVersions[ArraySize(bridgedTempSensorClusters)]; // // COMPOSED DEVICE ENDPOINT: contains the following clusters: // - Descriptor -// - Bridged Device Basic +// - Bridged Device Basic Information // Composed Device Configuration DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedComposedDeviceClusters) DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasic::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; + DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), + DECLARE_DYNAMIC_CLUSTER_LIST_END; DECLARE_DYNAMIC_ENDPOINT(bridgedComposedDeviceEndpoint, bridgedComposedDeviceClusters); DataVersion gComposedDeviceDataVersions[ArraySize(bridgedComposedDeviceClusters)]; @@ -290,8 +293,8 @@ DataVersion gComposedPowerSourceDataVersions[ArraySize(bridgedPowerSourceCluster // ================================================================================= #define ZCL_DESCRIPTOR_CLUSTER_REVISION (1u) -#define ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_REVISION (1u) -#define ZCL_BRIDGED_DEVICE_BASIC_FEATURE_MAP (0u) +#define ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION (1u) +#define ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_FEATURE_MAP (0u) #define ZCL_FIXED_LABEL_CLUSTER_REVISION (1u) #define ZCL_ON_OFF_CLUSTER_REVISION (4u) #define ZCL_TEMPERATURE_SENSOR_CLUSTER_REVISION (1u) @@ -427,12 +430,12 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) { if (itemChangedMask & Device::kChanged_Reachable) { - ScheduleReportingCallback(dev, BridgedDeviceBasic::Id, BridgedDeviceBasic::Attributes::Reachable::Id); + ScheduleReportingCallback(dev, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::Reachable::Id); } if (itemChangedMask & Device::kChanged_Name) { - ScheduleReportingCallback(dev, BridgedDeviceBasic::Id, BridgedDeviceBasic::Attributes::NodeLabel::Id); + ScheduleReportingCallback(dev, BridgedDeviceBasicInformation::Id, BridgedDeviceBasicInformation::Attributes::NodeLabel::Id); } } @@ -498,11 +501,11 @@ EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::Attribut } else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) { - *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_REVISION; + *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION; } else if ((attributeId == ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID) && (maxReadLength == 4)) { - *buffer = (uint32_t) ZCL_BRIDGED_DEVICE_BASIC_FEATURE_MAP; + *buffer = (uint32_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_FEATURE_MAP; } else { @@ -642,7 +645,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI { Device * dev = gDevices[endpointIndex]; - if (clusterId == BridgedDeviceBasic::Id) + if (clusterId == BridgedDeviceBasicInformation::Id) { ret = HandleReadBridgedDeviceBasicAttribute(dev, attributeMetadata->attributeId, buffer, maxReadLength); } diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto index 6f09e9faa7ba9a..99ca55f5f46e65 100644 --- a/examples/common/pigweed/protos/attributes_service.proto +++ b/examples/common/pigweed/protos/attributes_service.proto @@ -101,7 +101,7 @@ enum ClusterType { ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0035; ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0036; ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0037; - ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID = 0x0039; + ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_ID = 0x0039; ZCL_SWITCH_CLUSTER_ID = 0x003B; ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID = 0x003C; ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID = 0x003E; diff --git a/examples/dynamic-bridge-app/linux/README.md b/examples/dynamic-bridge-app/linux/README.md index aff20863c752c7..1e1d4f3fb9f141 100644 --- a/examples/dynamic-bridge-app/linux/README.md +++ b/examples/dynamic-bridge-app/linux/README.md @@ -87,7 +87,7 @@ clusters as well as the root descriptor cluster. The example demonstrates the use of dynamic endpoints and the concept of adding and removing endpoints at runtime. First, the example declares a `bridgedLightEndpoint` data structure for a Light endpoint with `OnOff`, -`Descriptor`, `BridgedDeviceBasic`, and `FixedLabel` clusters. +`Descriptor`, `BridgedDeviceBasicInformation`, and `FixedLabel` clusters. Using this declared endpoint structure, three endpoints for three bridged lights are dynamically added at endpoint ID's `2`, `3`, and `4`, representing @@ -99,10 +99,10 @@ A fourth light, `Light 4`, is then added occupying endpoint ID `5`. Finally, `Light 2` is re-added, and will occupy endpoint ID `6`. -All endpoints populate the `Bridged Device Basic` and `Fixed Label` clusters. In -the `Bridged Device Basic` cluster, the `reachable` attribute is simulated. In -the `Fixed Label` cluster, the `LabelList` attribute is simulated with the -value/label pair `"room"`/`[light name]`. +All endpoints populate the `Bridged Device Basic Information` and `Fixed Label` +clusters. In the `Bridged Device Basic Information` cluster, the `reachable` +attribute is simulated. In the `Fixed Label` cluster, the `LabelList` attribute +is simulated with the value/label pair `"room"`/`[light name]`. ## Building diff --git a/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h b/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h index 99f1c5e06bc98b..9e417814ac04a6 100644 --- a/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h +++ b/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h @@ -8,13 +8,13 @@ #include "data-model/Attribute.h" // Required for default initialization of cluster revisions. -static constexpr uint16_t ZCL_DESCRIPTOR_CLUSTER_REVISION = 1; -static constexpr uint16_t ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_REVISION = 1; -static constexpr uint16_t ZCL_FIXED_LABEL_CLUSTER_REVISION = 1; -static constexpr uint16_t ZCL_ON_OFF_CLUSTER_REVISION = 4; -static constexpr uint16_t ZCL_SWITCH_CLUSTER_REVISION = 1; -static constexpr uint16_t ZCL_LEVEL_CONTROL_CLUSTER_REVISION = 1; -static constexpr uint16_t ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_DESCRIPTOR_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_FIXED_LABEL_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_ON_OFF_CLUSTER_REVISION = 4; +static constexpr uint16_t ZCL_SWITCH_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_LEVEL_CONTROL_CLUSTER_REVISION = 1; +static constexpr uint16_t ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_REVISION = 1; class GeneratedCluster { diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint index 1e48cd89075687..958695dcb1310b 100644 --- a/scripts/rules.matterlint +++ b/scripts/rules.matterlint @@ -12,7 +12,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml"; load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml"; load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml"; diff --git a/src/app/clusters/bridged-device-basic-information-server/bridged-device-basic-information-server.cpp b/src/app/clusters/bridged-device-basic-information-server/bridged-device-basic-information-server.cpp index 634df17c1b1872..a8785abd516954 100644 --- a/src/app/clusters/bridged-device-basic-information-server/bridged-device-basic-information-server.cpp +++ b/src/app/clusters/bridged-device-basic-information-server/bridged-device-basic-information-server.cpp @@ -30,7 +30,7 @@ using namespace chip; using namespace chip::app; using namespace chip::app::Clusters; -using namespace chip::app::Clusters::BridgedDeviceBasic; +using namespace chip::app::Clusters::BridgedDeviceBasicInformation; namespace { @@ -52,9 +52,9 @@ void ReachableChanged(EndpointId endpointId) } // anonymous namespace -void MatterBridgedDeviceBasicClusterServerAttributeChangedCallback(const ConcreteAttributePath & attributePath) +void MatterBridgedDeviceBasicInformationClusterServerAttributeChangedCallback(const ConcreteAttributePath & attributePath) { - if (attributePath.mClusterId != BridgedDeviceBasic::Id) + if (attributePath.mClusterId != BridgedDeviceBasicInformation::Id) { ChipLogError(Zcl, "MatterBridgedDeviceBasicClusterServerAttributeChangedCallback: Incorrect cluster ID"); return; diff --git a/src/app/tests/suites/README.md b/src/app/tests/suites/README.md index 74e18fb020d32c..de391a64cebfc0 100644 --- a/src/app/tests/suites/README.md +++ b/src/app/tests/suites/README.md @@ -417,7 +417,7 @@ src/app/tests/suites/examples/gen_readme_example.sh | WiFiNetworkDiagnostics | NitricOxideConcentrationMeasurement | AccountLogin | | EthernetNetworkDiagnostics | NitrogenDioxideConcentrationMeasurement | TestCluster | | TimeSynchronization | OxygenConcentrationMeasurement | Messaging | -| BridgedDeviceBasic | OzoneConcentrationMeasurement | ApplianceIdentification | +| BridgedDeviceBasicInformation | OzoneConcentrationMeasurement | ApplianceIdentification | | Switch | SulfurDioxideConcentrationMeasurement | MeterIdentification | diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml index 44705b9932bdc0..3e2f416f6759ee 100644 --- a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml @@ -19,7 +19,7 @@ name: config: nodeId: 0x12344321 - cluster: "Bridged Device Basic" + cluster: "Bridged Device Basic Information" endpoint: 3 tests: diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml index 6592da0b8d116b..7dccb4c08fa6e0 100644 --- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml @@ -17,7 +17,7 @@ name: 130.2.1. [TC-BRBINFO-2.1] Attributes [DUT-Server] config: nodeId: 0x12344321 - cluster: "Bridged Device Basic" + cluster: "Bridged Device Basic Information" endpoint: 3 tests: diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 1115b776d5f2e8..155b07e0a360ab 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -167,7 +167,6 @@ void emberAfTick() // Cluster init functions that don't have a cluster implementation to define // them in. void MatterBooleanStatePluginServerInitCallback() {} -void MatterBridgedDeviceBasicPluginServerInitCallback() {} void MatterElectricalMeasurementPluginServerInitCallback() {} void MatterRelativeHumidityMeasurementPluginServerInitCallback() {} void MatterIlluminanceMeasurementPluginServerInitCallback() {} diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 9126b0ff26101a..7a57701dfacaf4 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -10,7 +10,7 @@ - + diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml similarity index 97% rename from src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml rename to src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml index 5d2f32a1cc3550..61e0cc011ad8d7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml +++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml @@ -17,14 +17,14 @@ limitations under the License. - Bridged Device Basic + Bridged Device Basic Information CHIP This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on the Endpoint where it is placed (and its Parts) is bridged from a non-CHIP technology; and provide a centralized collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user, such as the vendor name, the model name, or user-assigned name. 0x0039 - BRIDGED_DEVICE_BASIC_CLUSTER + BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER true true diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 3d63429fc4966c..e265c5f9a00222 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -21,7 +21,7 @@ "binding-cluster.xml", "boolean-state-cluster.xml", "actions-cluster.xml", - "bridged-device-basic.xml", + "bridged-device-basic-information.xml", "chip-ota.xml", "chip-types.xml", "channel-cluster.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index d4003b118101da..2f106b8eab2fa5 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -16,7 +16,7 @@ "binding-cluster.xml", "boolean-state-cluster.xml", "actions-cluster.xml", - "bridged-device-basic.xml", + "bridged-device-basic-information.xml", "chip-ota.xml", "chip-types.xml", "channel-cluster.xml", diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index c810d979c39dc8..0a21830a55dbfd 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -23,7 +23,7 @@ 'BINDING_CLUSTER': ['bindings'], 'BOOLEAN_STATE_CLUSTER': [], 'ACTIONS_CLUSTER': [], - 'BRIDGED_DEVICE_BASIC_CLUSTER': ['bridged-device-basic-information-server'], + 'BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER': ['bridged-device-basic-information-server'], 'CHANNEL_CLUSTER': ['channel-server'], 'CLIENT_MONITORING_CLUSTER': ['client-monitoring-server'], 'COLOR_CONTROL_CLUSTER': ['color-control-server'], @@ -109,7 +109,7 @@ 'BINDING_CLUSTER': [], 'BOOLEAN_STATE_CLUSTER': [], 'ACTIONS_CLUSTER': [], - 'BRIDGED_DEVICE_BASIC_CLUSTER': [], + 'BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER': [], 'CHANNEL_CLUSTER': [], 'CLIENT_MONITORING_CLUSTER': [], 'COLOR_CONTROL_CLUSTER': [], diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn index e5a061b94c814c..de4f3413075332 100644 --- a/src/controller/data_model/BUILD.gn +++ b/src/controller/data_model/BUILD.gn @@ -96,8 +96,8 @@ if (current_os == "android" || build_java_matter_controller) { "jni/WiFiNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp", "jni/EthernetNetworkDiagnosticsClient-ReadImpl.cpp", "jni/EthernetNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp", - "jni/BridgedDeviceBasicClient-ReadImpl.cpp", - "jni/BridgedDeviceBasicClient-InvokeSubscribeImpl.cpp", + "jni/BridgedDeviceBasicInformationClient-ReadImpl.cpp", + "jni/BridgedDeviceBasicInformationClient-InvokeSubscribeImpl.cpp", "jni/SwitchClient-ReadImpl.cpp", "jni/SwitchClient-InvokeSubscribeImpl.cpp", "jni/AdministratorCommissioningClient-ReadImpl.cpp", diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a4e66e691a0455..b1e3ad5159902b 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1682,7 +1682,7 @@ client cluster EthernetNetworkDiagnostics = 55 { command ResetCounts(): DefaultSuccess = 0; } -client cluster BridgedDeviceBasic = 57 { +client cluster BridgedDeviceBasicInformation = 57 { critical event StartUp = 0 { INT32U softwareVersion = 0; } @@ -4480,7 +4480,7 @@ endpoint 1 { binding cluster ThreadNetworkDiagnostics; binding cluster WiFiNetworkDiagnostics; binding cluster EthernetNetworkDiagnostics; - binding cluster BridgedDeviceBasic; + binding cluster BridgedDeviceBasicInformation; binding cluster Switch; binding cluster AdministratorCommissioning; binding cluster OperationalCredentials; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 9004d79d58bd1d..b80e6e3f7fed1b 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -7439,10 +7439,10 @@ ] }, { - "name": "Bridged Device Basic", + "name": "Bridged Device Basic Information", "code": 57, "mfgCode": null, - "define": "BRIDGED_DEVICE_BASIC_CLUSTER", + "define": "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -7465,10 +7465,10 @@ ] }, { - "name": "Bridged Device Basic", + "name": "Bridged Device Basic Information", "code": 57, "mfgCode": null, - "define": "BRIDGED_DEVICE_BASIC_CLUSTER", + "define": "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index a912db34f740ac..f4d292b1b50610 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -7626,8 +7626,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::BridgedDeviceBasic::Id: { - using namespace app::Clusters::BridgedDeviceBasic; + case app::Clusters::BridgedDeviceBasicInformation::Id: { + using namespace app::Clusters::BridgedDeviceBasicInformation; switch (aPath.mAttributeId) { case Attributes::VendorName::Id: { diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 9c7f7eaf476412..324a990836c2fb 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -777,46 +777,46 @@ typedef void (*CHIPEthernetNetworkDiagnosticsClusterFeatureMapAttributeCallbackT typedef void (*CHIPEthernetNetworkDiagnosticsClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::EthernetNetworkDiagnostics::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterVendorNameAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorName::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterVendorIDAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::VendorID::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterProductNameAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductName::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterNodeLabelAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterHardwareVersionStringAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterSoftwareVersionStringAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterManufacturingDateAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterPartNumberAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::PartNumber::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterProductURLAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductURL::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterProductLabelAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterSerialNumberAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterReachableAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::Reachable::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterUniqueIDAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::UniqueID::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterGeneratedCommandListAttributeCallbackType)( - void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo::DecodableType &); -typedef void (*CHIPBridgedDeviceBasicClusterAcceptedCommandListAttributeCallbackType)( - void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo::DecodableType &); -typedef void (*CHIPBridgedDeviceBasicClusterAttributeListAttributeCallbackType)( - void *, const chip::app::Clusters::BridgedDeviceBasic::Attributes::AttributeList::TypeInfo::DecodableType &); -typedef void (*CHIPBridgedDeviceBasicClusterFeatureMapAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo::DecodableArgType); -typedef void (*CHIPBridgedDeviceBasicClusterClusterRevisionAttributeCallbackType)( - void *, chip::app::Clusters::BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterVendorNameAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::VendorName::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterVendorIDAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::VendorID::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterProductNameAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::ProductName::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterNodeLabelAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterHardwareVersionAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::HardwareVersion::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterHardwareVersionStringAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::HardwareVersionString::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterSoftwareVersionAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::SoftwareVersion::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterSoftwareVersionStringAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterManufacturingDateAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::ManufacturingDate::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterPartNumberAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::PartNumber::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterProductURLAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::ProductURL::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterProductLabelAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::ProductLabel::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterSerialNumberAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::SerialNumber::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterReachableAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::Reachable::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterUniqueIDAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::UniqueID::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallbackType)( + void *, const chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::TypeInfo::DecodableType &); +typedef void (*CHIPBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallbackType)( + void *, const chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::TypeInfo::DecodableType &); +typedef void (*CHIPBridgedDeviceBasicInformationClusterAttributeListAttributeCallbackType)( + void *, const chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::AttributeList::TypeInfo::DecodableType &); +typedef void (*CHIPBridgedDeviceBasicInformationClusterFeatureMapAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::FeatureMap::TypeInfo::DecodableArgType); +typedef void (*CHIPBridgedDeviceBasicInformationClusterClusterRevisionAttributeCallbackType)( + void *, chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::ClusterRevision::TypeInfo::DecodableArgType); typedef void (*CHIPSwitchClusterNumberOfPositionsAttributeCallbackType)( void *, chip::app::Clusters::Switch::Attributes::NumberOfPositions::TypeInfo::DecodableArgType); diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 1b78fa5638cf10..0f32f4bbddf53d 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -1791,12 +1791,12 @@ JNI_METHOD(void, NetworkCommissioningCluster, writeInterfaceEnabledAttribute) onFailure.release(); } -JNI_METHOD(void, BridgedDeviceBasicCluster, writeNodeLabelAttribute) +JNI_METHOD(void, BridgedDeviceBasicInformationCluster, writeNodeLabelAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo; + using TypeInfo = chip::app::Clusters::BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -1817,8 +1817,8 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, writeNodeLabelAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - BridgedDeviceBasicCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + BridgedDeviceBasicInformationCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index 8b08310c1c819f..3c9086d31ef738 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -1707,8 +1707,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::BridgedDeviceBasic::Id: { - using namespace app::Clusters::BridgedDeviceBasic; + case app::Clusters::BridgedDeviceBasicInformation::Id: { + using namespace app::Clusters::BridgedDeviceBasicInformation; switch (aPath.mEventId) { case Events::StartUp::Id: { @@ -1727,16 +1727,16 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & jclass startUpStructClass; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicClusterStartUpEvent", startUpStructClass); + env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicInformationClusterStartUpEvent", startUpStructClass); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicClusterStartUpEvent"); + ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicInformationClusterStartUpEvent"); return nullptr; } jmethodID startUpStructCtor = env->GetMethodID(startUpStructClass, "", "(Ljava/lang/Long;)V"); if (startUpStructCtor == nullptr) { - ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicClusterStartUpEvent constructor"); + ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicInformationClusterStartUpEvent constructor"); return nullptr; } @@ -1753,16 +1753,17 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } jclass shutDownStructClass; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicClusterShutDownEvent", shutDownStructClass); + env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicInformationClusterShutDownEvent", + shutDownStructClass); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicClusterShutDownEvent"); + ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicInformationClusterShutDownEvent"); return nullptr; } jmethodID shutDownStructCtor = env->GetMethodID(shutDownStructClass, "", "()V"); if (shutDownStructCtor == nullptr) { - ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicClusterShutDownEvent constructor"); + ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicInformationClusterShutDownEvent constructor"); return nullptr; } @@ -1779,16 +1780,16 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } jclass leaveStructClass; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicClusterLeaveEvent", leaveStructClass); + env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicInformationClusterLeaveEvent", leaveStructClass); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicClusterLeaveEvent"); + ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicInformationClusterLeaveEvent"); return nullptr; } jmethodID leaveStructCtor = env->GetMethodID(leaveStructClass, "", "()V"); if (leaveStructCtor == nullptr) { - ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicClusterLeaveEvent constructor"); + ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicInformationClusterLeaveEvent constructor"); return nullptr; } @@ -1812,18 +1813,20 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & jclass reachableChangedStructClass; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicClusterReachableChangedEvent", + env, "chip/devicecontroller/ChipEventStructs$BridgedDeviceBasicInformationClusterReachableChangedEvent", reachableChangedStructClass); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedDeviceBasicClusterReachableChangedEvent"); + ChipLogError(Zcl, + "Could not find class ChipEventStructs$BridgedDeviceBasicInformationClusterReachableChangedEvent"); return nullptr; } jmethodID reachableChangedStructCtor = env->GetMethodID(reachableChangedStructClass, "", "(Ljava/lang/Boolean;)V"); if (reachableChangedStructCtor == nullptr) { - ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicClusterReachableChangedEvent constructor"); + ChipLogError( + Zcl, "Could not find ChipEventStructs$BridgedDeviceBasicInformationClusterReachableChangedEvent constructor"); return nullptr; } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 576fb43c870dde..f0932f7101cbfb 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -11798,9 +11798,9 @@ void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPBridgedDeviceBasicVendorIDAttributeCallback::CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback::CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -11817,7 +11817,7 @@ CHIPBridgedDeviceBasicVendorIDAttributeCallback::CHIPBridgedDeviceBasicVendorIDA } } -CHIPBridgedDeviceBasicVendorIDAttributeCallback::~CHIPBridgedDeviceBasicVendorIDAttributeCallback() +CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback::~CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -11828,7 +11828,7 @@ CHIPBridgedDeviceBasicVendorIDAttributeCallback::~CHIPBridgedDeviceBasicVendorID env->DeleteGlobalRef(javaCallbackRef); } -void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value) +void CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -11836,8 +11836,8 @@ void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context, jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -11857,9 +11857,9 @@ void CHIPBridgedDeviceBasicVendorIDAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback:: + CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -11876,7 +11876,8 @@ CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CHIPBridgedDeviceBa } } -CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback() +CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback:: + ~CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -11887,7 +11888,7 @@ CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::~CHIPBridgedDeviceB env->DeleteGlobalRef(javaCallbackRef); } -void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -11897,8 +11898,8 @@ void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -11928,9 +11929,9 @@ void CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback:: + CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -11947,7 +11948,8 @@ CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CHIPBridgedDeviceBas } } -CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback() +CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback:: + ~CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -11958,7 +11960,7 @@ CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::~CHIPBridgedDeviceBa env->DeleteGlobalRef(javaCallbackRef); } -void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -11968,8 +11970,8 @@ void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -11999,9 +12001,9 @@ void CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPBridgedDeviceBasicAttributeListAttributeCallback::CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback::CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -12018,7 +12020,7 @@ CHIPBridgedDeviceBasicAttributeListAttributeCallback::CHIPBridgedDeviceBasicAttr } } -CHIPBridgedDeviceBasicAttributeListAttributeCallback::~CHIPBridgedDeviceBasicAttributeListAttributeCallback() +CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback::~CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -12029,7 +12031,7 @@ CHIPBridgedDeviceBasicAttributeListAttributeCallback::~CHIPBridgedDeviceBasicAtt env->DeleteGlobalRef(javaCallbackRef); } -void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn( +void CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -12039,8 +12041,8 @@ void CHIPBridgedDeviceBasicAttributeListAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 1b9e29c1571b20..84c78b2432debf 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -4900,20 +4900,20 @@ class CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback bool keepAlive; }; -class CHIPBridgedDeviceBasicVendorIDAttributeCallback - : public chip::Callback::Callback +class CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback + : public chip::Callback::Callback { public: - CHIPBridgedDeviceBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPBridgedDeviceBasicVendorIDAttributeCallback(); + ~CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback(); - static void maybeDestroy(CHIPBridgedDeviceBasicVendorIDAttributeCallback * callback) + static void maybeDestroy(CHIPBridgedDeviceBasicInformationVendorIDAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -4921,7 +4921,7 @@ class CHIPBridgedDeviceBasicVendorIDAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4930,20 +4930,20 @@ class CHIPBridgedDeviceBasicVendorIDAttributeCallback bool keepAlive; }; -class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback - : public chip::Callback::Callback +class CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback + : public chip::Callback::Callback { public: - CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback(); + ~CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback(); - static void maybeDestroy(CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback * callback) + static void maybeDestroy(CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -4951,7 +4951,7 @@ class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4960,20 +4960,20 @@ class CHIPBridgedDeviceBasicGeneratedCommandListAttributeCallback bool keepAlive; }; -class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback - : public chip::Callback::Callback +class CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback + : public chip::Callback::Callback { public: - CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback(); + ~CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback(); - static void maybeDestroy(CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback * callback) + static void maybeDestroy(CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -4981,7 +4981,7 @@ class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; @@ -4990,20 +4990,20 @@ class CHIPBridgedDeviceBasicAcceptedCommandListAttributeCallback bool keepAlive; }; -class CHIPBridgedDeviceBasicAttributeListAttributeCallback - : public chip::Callback::Callback +class CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback + : public chip::Callback::Callback { public: - CHIPBridgedDeviceBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false); + CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false); - ~CHIPBridgedDeviceBasicAttributeListAttributeCallback(); + ~CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback(); - static void maybeDestroy(CHIPBridgedDeviceBasicAttributeListAttributeCallback * callback) + static void maybeDestroy(CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback * callback) { if (!callback->keepAlive) { callback->Cancel(); - chip::Platform::Delete(callback); + chip::Platform::Delete(callback); } } @@ -5011,7 +5011,7 @@ class CHIPBridgedDeviceBasicAttributeListAttributeCallback static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); + reinterpret_cast(context)->javaCallbackRef); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); }; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 4ae3c8e5af58d2..5b3e258863515c 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -9146,10 +9146,10 @@ private native void subscribeClusterRevisionAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); } - public static class BridgedDeviceBasicCluster extends BaseChipCluster { + public static class BridgedDeviceBasicInformationCluster extends BaseChipCluster { public static final long CLUSTER_ID = 57L; - public BridgedDeviceBasicCluster(long devicePtr, int endpointId) { + public BridgedDeviceBasicInformationCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java index 2040b030738a89..9db564c1e04f45 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java @@ -653,17 +653,17 @@ public String toString() { } } - public static class BridgedDeviceBasicClusterStartUpEvent { + public static class BridgedDeviceBasicInformationClusterStartUpEvent { public Long softwareVersion; - public BridgedDeviceBasicClusterStartUpEvent(Long softwareVersion) { + public BridgedDeviceBasicInformationClusterStartUpEvent(Long softwareVersion) { this.softwareVersion = softwareVersion; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("BridgedDeviceBasicClusterStartUpEvent {\n"); + output.append("BridgedDeviceBasicInformationClusterStartUpEvent {\n"); output.append("\tsoftwareVersion: "); output.append(softwareVersion); output.append("\n"); @@ -672,43 +672,43 @@ public String toString() { } } - public static class BridgedDeviceBasicClusterShutDownEvent { + public static class BridgedDeviceBasicInformationClusterShutDownEvent { - public BridgedDeviceBasicClusterShutDownEvent() {} + public BridgedDeviceBasicInformationClusterShutDownEvent() {} @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("BridgedDeviceBasicClusterShutDownEvent {\n"); + output.append("BridgedDeviceBasicInformationClusterShutDownEvent {\n"); output.append("}\n"); return output.toString(); } } - public static class BridgedDeviceBasicClusterLeaveEvent { + public static class BridgedDeviceBasicInformationClusterLeaveEvent { - public BridgedDeviceBasicClusterLeaveEvent() {} + public BridgedDeviceBasicInformationClusterLeaveEvent() {} @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("BridgedDeviceBasicClusterLeaveEvent {\n"); + output.append("BridgedDeviceBasicInformationClusterLeaveEvent {\n"); output.append("}\n"); return output.toString(); } } - public static class BridgedDeviceBasicClusterReachableChangedEvent { + public static class BridgedDeviceBasicInformationClusterReachableChangedEvent { public Boolean reachableNewValue; - public BridgedDeviceBasicClusterReachableChangedEvent(Boolean reachableNewValue) { + public BridgedDeviceBasicInformationClusterReachableChangedEvent(Boolean reachableNewValue) { this.reachableNewValue = reachableNewValue; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("BridgedDeviceBasicClusterReachableChangedEvent {\n"); + output.append("BridgedDeviceBasicInformationClusterReachableChangedEvent {\n"); output.append("\treachableNewValue: "); output.append(reachableNewValue); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 90ac14ecb5b15c..78e05d7c824012 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -107,7 +107,7 @@ public static String clusterIdToName(long clusterId) { return "EthernetNetworkDiagnostics"; } if (clusterId == 57L) { - return "BridgedDeviceBasic"; + return "BridgedDeviceBasicInformation"; } if (clusterId == 59L) { return "Switch"; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 2a4857ae12fa87..856a82753c38a3 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -3169,8 +3169,10 @@ public void onError(Exception ex) { } } - public static class DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback - implements ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback, + public static + class DelegatedBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallback + implements ChipClusters.BridgedDeviceBasicInformationCluster + .GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -3193,8 +3195,10 @@ public void onError(Exception ex) { } } - public static class DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback - implements ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback, + public static + class DelegatedBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallback + implements ChipClusters.BridgedDeviceBasicInformationCluster + .AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -3217,8 +3221,8 @@ public void onError(Exception ex) { } } - public static class DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback - implements ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback, + public static class DelegatedBridgedDeviceBasicInformationClusterAttributeListAttributeCallback + implements ChipClusters.BridgedDeviceBasicInformationCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7382,11 +7386,12 @@ public Map initializeClusterMap() { new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo); - ClusterInfo bridgedDeviceBasicClusterInfo = + ClusterInfo bridgedDeviceBasicInformationClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId), + (ptr, endpointId) -> + new ChipClusters.BridgedDeviceBasicInformationCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo); + clusterMap.put("bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInfo); ClusterInfo switchClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), new HashMap<>()); @@ -7626,7 +7631,9 @@ public void combineCommand( destination .get("ethernetNetworkDiagnostics") .combineCommands(source.get("ethernetNetworkDiagnostics")); - destination.get("bridgedDeviceBasic").combineCommands(source.get("bridgedDeviceBasic")); + destination + .get("bridgedDeviceBasicInformation") + .combineCommands(source.get("bridgedDeviceBasicInformation")); destination.get("switch").combineCommands(source.get("switch")); destination .get("administratorCommissioning") @@ -9280,9 +9287,10 @@ public Map> getCommandMap() { "resetCounts", ethernetNetworkDiagnosticsresetCountsInteractionInfo); commandMap.put( "ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInteractionInfoMap); - Map bridgedDeviceBasicClusterInteractionInfoMap = + Map bridgedDeviceBasicInformationClusterInteractionInfoMap = new LinkedHashMap<>(); - commandMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInteractionInfoMap); + commandMap.put( + "bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInteractionInfoMap); Map switchClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("switch", switchClusterInteractionInfoMap); Map administratorCommissioningClusterInteractionInfoMap = diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 5ae1c4204d4dd9..2fe3b5892ab069 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -4881,272 +4881,296 @@ public Map> getReadAttributeMap() { readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo); readAttributeMap.put( "ethernetNetworkDiagnostics", readEthernetNetworkDiagnosticsInteractionInfo); - Map readBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>(); - Map readBridgedDeviceBasicVendorNameCommandParams = + Map readBridgedDeviceBasicInformationInteractionInfo = + new LinkedHashMap<>(); + Map readBridgedDeviceBasicInformationVendorNameCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicVendorNameAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationVendorNameAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readVendorNameAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicVendorNameCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readVendorNameAttribute", readBridgedDeviceBasicVendorNameAttributeInteractionInfo); - Map readBridgedDeviceBasicVendorIDCommandParams = + readBridgedDeviceBasicInformationVendorNameCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readVendorNameAttribute", + readBridgedDeviceBasicInformationVendorNameAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationVendorIDCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicVendorIDAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationVendorIDAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readVendorIDAttribute( - (ChipClusters.BridgedDeviceBasicCluster.VendorIDAttributeCallback) callback); + (ChipClusters.BridgedDeviceBasicInformationCluster.VendorIDAttributeCallback) + callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readBridgedDeviceBasicVendorIDCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readVendorIDAttribute", readBridgedDeviceBasicVendorIDAttributeInteractionInfo); - Map readBridgedDeviceBasicProductNameCommandParams = + readBridgedDeviceBasicInformationVendorIDCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readVendorIDAttribute", readBridgedDeviceBasicInformationVendorIDAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationProductNameCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicProductNameAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationProductNameAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readProductNameAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicProductNameCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readProductNameAttribute", readBridgedDeviceBasicProductNameAttributeInteractionInfo); - Map readBridgedDeviceBasicNodeLabelCommandParams = + readBridgedDeviceBasicInformationProductNameCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readProductNameAttribute", + readBridgedDeviceBasicInformationProductNameAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationNodeLabelCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicNodeLabelAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationNodeLabelAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readNodeLabelAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicNodeLabelCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readNodeLabelAttribute", readBridgedDeviceBasicNodeLabelAttributeInteractionInfo); - Map readBridgedDeviceBasicHardwareVersionCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo = + readBridgedDeviceBasicInformationNodeLabelCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readNodeLabelAttribute", + readBridgedDeviceBasicInformationNodeLabelAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationHardwareVersionCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationHardwareVersionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readHardwareVersionAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readBridgedDeviceBasicHardwareVersionCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationHardwareVersionCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readHardwareVersionAttribute", - readBridgedDeviceBasicHardwareVersionAttributeInteractionInfo); - Map readBridgedDeviceBasicHardwareVersionStringCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo = + readBridgedDeviceBasicInformationHardwareVersionAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationHardwareVersionStringCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationHardwareVersionStringAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readHardwareVersionStringAttribute( (ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicHardwareVersionStringCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationHardwareVersionStringCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readHardwareVersionStringAttribute", - readBridgedDeviceBasicHardwareVersionStringAttributeInteractionInfo); - Map readBridgedDeviceBasicSoftwareVersionCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo = + readBridgedDeviceBasicInformationHardwareVersionStringAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationSoftwareVersionCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationSoftwareVersionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readSoftwareVersionAttribute((ChipClusters.LongAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readBridgedDeviceBasicSoftwareVersionCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationSoftwareVersionCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readSoftwareVersionAttribute", - readBridgedDeviceBasicSoftwareVersionAttributeInteractionInfo); - Map readBridgedDeviceBasicSoftwareVersionStringCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo = + readBridgedDeviceBasicInformationSoftwareVersionAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationSoftwareVersionStringCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationSoftwareVersionStringAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readSoftwareVersionStringAttribute( (ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicSoftwareVersionStringCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationSoftwareVersionStringCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readSoftwareVersionStringAttribute", - readBridgedDeviceBasicSoftwareVersionStringAttributeInteractionInfo); - Map readBridgedDeviceBasicManufacturingDateCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo = + readBridgedDeviceBasicInformationSoftwareVersionStringAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationManufacturingDateCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationManufacturingDateAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readManufacturingDateAttribute( (ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicManufacturingDateCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationManufacturingDateCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readManufacturingDateAttribute", - readBridgedDeviceBasicManufacturingDateAttributeInteractionInfo); - Map readBridgedDeviceBasicPartNumberCommandParams = + readBridgedDeviceBasicInformationManufacturingDateAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationPartNumberCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicPartNumberAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationPartNumberAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readPartNumberAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicPartNumberCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readPartNumberAttribute", readBridgedDeviceBasicPartNumberAttributeInteractionInfo); - Map readBridgedDeviceBasicProductURLCommandParams = + readBridgedDeviceBasicInformationPartNumberCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readPartNumberAttribute", + readBridgedDeviceBasicInformationPartNumberAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationProductURLCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicProductURLAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationProductURLAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readProductURLAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicProductURLCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readProductURLAttribute", readBridgedDeviceBasicProductURLAttributeInteractionInfo); - Map readBridgedDeviceBasicProductLabelCommandParams = + readBridgedDeviceBasicInformationProductURLCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readProductURLAttribute", + readBridgedDeviceBasicInformationProductURLAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationProductLabelCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicProductLabelAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationProductLabelAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readProductLabelAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicProductLabelCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readProductLabelAttribute", readBridgedDeviceBasicProductLabelAttributeInteractionInfo); - Map readBridgedDeviceBasicSerialNumberCommandParams = + readBridgedDeviceBasicInformationProductLabelCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readProductLabelAttribute", + readBridgedDeviceBasicInformationProductLabelAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationSerialNumberCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicSerialNumberAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationSerialNumberAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readSerialNumberAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicSerialNumberCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readSerialNumberAttribute", readBridgedDeviceBasicSerialNumberAttributeInteractionInfo); - Map readBridgedDeviceBasicReachableCommandParams = + readBridgedDeviceBasicInformationSerialNumberCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readSerialNumberAttribute", + readBridgedDeviceBasicInformationSerialNumberAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationReachableCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicReachableAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationReachableAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readReachableAttribute((ChipClusters.BooleanAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), - readBridgedDeviceBasicReachableCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readReachableAttribute", readBridgedDeviceBasicReachableAttributeInteractionInfo); - Map readBridgedDeviceBasicUniqueIDCommandParams = + readBridgedDeviceBasicInformationReachableCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readReachableAttribute", + readBridgedDeviceBasicInformationReachableAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationUniqueIDCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicUniqueIDAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationUniqueIDAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readUniqueIDAttribute((ChipClusters.CharStringAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readBridgedDeviceBasicUniqueIDCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readUniqueIDAttribute", readBridgedDeviceBasicUniqueIDAttributeInteractionInfo); - Map readBridgedDeviceBasicGeneratedCommandListCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo = + readBridgedDeviceBasicInformationUniqueIDCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readUniqueIDAttribute", readBridgedDeviceBasicInformationUniqueIDAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readGeneratedCommandListAttribute( - (ChipClusters.BridgedDeviceBasicCluster.GeneratedCommandListAttributeCallback) + (ChipClusters.BridgedDeviceBasicInformationCluster + .GeneratedCommandListAttributeCallback) callback); }, () -> new ClusterInfoMapping - .DelegatedBridgedDeviceBasicClusterGeneratedCommandListAttributeCallback(), - readBridgedDeviceBasicGeneratedCommandListCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + .DelegatedBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallback(), + readBridgedDeviceBasicInformationGeneratedCommandListCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readGeneratedCommandListAttribute", - readBridgedDeviceBasicGeneratedCommandListAttributeInteractionInfo); - Map readBridgedDeviceBasicAcceptedCommandListCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo = + readBridgedDeviceBasicInformationGeneratedCommandListAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readAcceptedCommandListAttribute( - (ChipClusters.BridgedDeviceBasicCluster.AcceptedCommandListAttributeCallback) + (ChipClusters.BridgedDeviceBasicInformationCluster + .AcceptedCommandListAttributeCallback) callback); }, () -> new ClusterInfoMapping - .DelegatedBridgedDeviceBasicClusterAcceptedCommandListAttributeCallback(), - readBridgedDeviceBasicAcceptedCommandListCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + .DelegatedBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallback(), + readBridgedDeviceBasicInformationAcceptedCommandListCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readAcceptedCommandListAttribute", - readBridgedDeviceBasicAcceptedCommandListAttributeInteractionInfo); - Map readBridgedDeviceBasicAttributeListCommandParams = + readBridgedDeviceBasicInformationAcceptedCommandListAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicAttributeListAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readAttributeListAttribute( - (ChipClusters.BridgedDeviceBasicCluster.AttributeListAttributeCallback) + (ChipClusters.BridgedDeviceBasicInformationCluster + .AttributeListAttributeCallback) callback); }, () -> new ClusterInfoMapping - .DelegatedBridgedDeviceBasicClusterAttributeListAttributeCallback(), - readBridgedDeviceBasicAttributeListCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readAttributeListAttribute", readBridgedDeviceBasicAttributeListAttributeInteractionInfo); - Map readBridgedDeviceBasicFeatureMapCommandParams = + .DelegatedBridgedDeviceBasicInformationClusterAttributeListAttributeCallback(), + readBridgedDeviceBasicInformationAttributeListCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readAttributeListAttribute", + readBridgedDeviceBasicInformationAttributeListAttributeInteractionInfo); + Map readBridgedDeviceBasicInformationFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicFeatureMapAttributeInteractionInfo = + InteractionInfo readBridgedDeviceBasicInformationFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readBridgedDeviceBasicFeatureMapCommandParams); - readBridgedDeviceBasicInteractionInfo.put( - "readFeatureMapAttribute", readBridgedDeviceBasicFeatureMapAttributeInteractionInfo); - Map readBridgedDeviceBasicClusterRevisionCommandParams = - new LinkedHashMap(); - InteractionInfo readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo = + readBridgedDeviceBasicInformationFeatureMapCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( + "readFeatureMapAttribute", + readBridgedDeviceBasicInformationFeatureMapAttributeInteractionInfo); + Map + readBridgedDeviceBasicInformationClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo readBridgedDeviceBasicInformationClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readBridgedDeviceBasicClusterRevisionCommandParams); - readBridgedDeviceBasicInteractionInfo.put( + readBridgedDeviceBasicInformationClusterRevisionCommandParams); + readBridgedDeviceBasicInformationInteractionInfo.put( "readClusterRevisionAttribute", - readBridgedDeviceBasicClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("bridgedDeviceBasic", readBridgedDeviceBasicInteractionInfo); + readBridgedDeviceBasicInformationClusterRevisionAttributeInteractionInfo); + readAttributeMap.put( + "bridgedDeviceBasicInformation", readBridgedDeviceBasicInformationInteractionInfo); Map readSwitchInteractionInfo = new LinkedHashMap<>(); Map readSwitchNumberOfPositionsCommandParams = new LinkedHashMap(); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java index 10f10c28583be5..092e6951ffd9f1 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java @@ -488,25 +488,28 @@ public Map> getWriteAttributeMap() { new LinkedHashMap<>(); writeAttributeMap.put( "ethernetNetworkDiagnostics", writeEthernetNetworkDiagnosticsInteractionInfo); - Map writeBridgedDeviceBasicInteractionInfo = new LinkedHashMap<>(); - Map writeBridgedDeviceBasicNodeLabelCommandParams = + Map writeBridgedDeviceBasicInformationInteractionInfo = + new LinkedHashMap<>(); + Map writeBridgedDeviceBasicInformationNodeLabelCommandParams = new LinkedHashMap(); - CommandParameterInfo bridgedDeviceBasicnodeLabelCommandParameterInfo = + CommandParameterInfo bridgedDeviceBasicInformationnodeLabelCommandParameterInfo = new CommandParameterInfo("value", String.class, String.class); - writeBridgedDeviceBasicNodeLabelCommandParams.put( - "value", bridgedDeviceBasicnodeLabelCommandParameterInfo); - InteractionInfo writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo = + writeBridgedDeviceBasicInformationNodeLabelCommandParams.put( + "value", bridgedDeviceBasicInformationnodeLabelCommandParameterInfo); + InteractionInfo writeBridgedDeviceBasicInformationNodeLabelAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.BridgedDeviceBasicCluster) cluster) + ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster) .writeNodeLabelAttribute( (DefaultClusterCallback) callback, (String) commandArguments.get("value")); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeBridgedDeviceBasicNodeLabelCommandParams); - writeBridgedDeviceBasicInteractionInfo.put( - "writeNodeLabelAttribute", writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo); - writeAttributeMap.put("bridgedDeviceBasic", writeBridgedDeviceBasicInteractionInfo); + writeBridgedDeviceBasicInformationNodeLabelCommandParams); + writeBridgedDeviceBasicInformationInteractionInfo.put( + "writeNodeLabelAttribute", + writeBridgedDeviceBasicInformationNodeLabelAttributeInteractionInfo); + writeAttributeMap.put( + "bridgedDeviceBasicInformation", writeBridgedDeviceBasicInformationInteractionInfo); Map writeSwitchInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("switch", writeSwitchInteractionInfo); Map writeAdministratorCommissioningInteractionInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 38ad1730b57cc8..f06a025be33dd4 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -2826,8 +2826,8 @@ class ChipClusters: }, }, } - _BRIDGED_DEVICE_BASIC_CLUSTER_INFO = { - "clusterName": "BridgedDeviceBasic", + _BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_INFO = { + "clusterName": "BridgedDeviceBasicInformation", "clusterId": 0x00000039, "commands": { }, @@ -7609,7 +7609,7 @@ class ChipClusters: 0x00000035: _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO, 0x00000036: _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO, 0x00000037: _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO, - 0x00000039: _BRIDGED_DEVICE_BASIC_CLUSTER_INFO, + 0x00000039: _BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_INFO, 0x0000003B: _SWITCH_CLUSTER_INFO, 0x0000003C: _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO, 0x0000003E: _OPERATIONAL_CREDENTIALS_CLUSTER_INFO, @@ -7678,7 +7678,7 @@ class ChipClusters: "ThreadNetworkDiagnostics": _THREAD_NETWORK_DIAGNOSTICS_CLUSTER_INFO, "WiFiNetworkDiagnostics": _WI_FI_NETWORK_DIAGNOSTICS_CLUSTER_INFO, "EthernetNetworkDiagnostics": _ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_INFO, - "BridgedDeviceBasic": _BRIDGED_DEVICE_BASIC_CLUSTER_INFO, + "BridgedDeviceBasicInformation": _BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_INFO, "Switch": _SWITCH_CLUSTER_INFO, "AdministratorCommissioning": _ADMINISTRATOR_COMMISSIONING_CLUSTER_INFO, "OperationalCredentials": _OPERATIONAL_CREDENTIALS_CLUSTER_INFO, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 92cab8362db39a..ca399bc791101d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -10470,7 +10470,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class BridgedDeviceBasic(Cluster): +class BridgedDeviceBasicInformation(Cluster): id: typing.ClassVar[int] = 0x0039 @ChipUtility.classproperty diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index c6f10ff992b00a..acff3d68d31c26 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4559,6 +4559,7 @@ - WakeOnLAN - ClientMonitoring - BasicInformation + - BridgedDeviceBasicInformation attributes: Descriptor: # We really only started treating DeviceTypeList as DeviceTypeList in the API revamp, @@ -4725,6 +4726,27 @@ - RSSI GeneralDiagnostics: - BootReason + BridgedDeviceBasicInformation: + - VendorName + - VendorID + - ProductName + - NodeLabel + - HardwareVersion + - HardwareVersionString + - SoftwareVersion + - SoftwareVersionString + - ManufacturingDate + - PartNumber + - ProductURL + - ProductLabel + - SerialNumber + - Reachable + - UniqueID + - GeneratedCommandList + - AcceptedCommandList + - AttributeList + - FeatureMap + - ClusterRevision commands: OTASoftwareUpdateProvider: - QueryImage @@ -5095,6 +5117,11 @@ - WiredFaultChange - BatFaultChange - BatChargeFaultChange + BridgedDeviceBasicInformation: + - StartUp + - ShutDown + - Leave + - ReachableChanged event fields: Switch: MultiPressComplete: @@ -5140,6 +5167,11 @@ BatChargeFaultChange: - current - previous + BridgedDeviceBasicInformation: + StartUp: + - softwareVersion + ReachableChanged: + - reachableNewValue enums: OTASoftwareUpdateProvider: - OTAApplyUpdateAction @@ -5478,6 +5510,7 @@ OTASoftwareUpdateProvider: OtaSoftwareUpdateProvider OTASoftwareUpdateRequestor: OtaSoftwareUpdateRequestor WakeOnLAN: WakeOnLan + BridgedDeviceBasicInformation: BridgedDeviceBasic attributes: Descriptor: DeviceTypeList: DeviceList diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index b0508b5329ac82..26cd31b54bb356 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -6282,8 +6282,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & } break; } - case Clusters::BridgedDeviceBasic::Id: { - using namespace Clusters::BridgedDeviceBasic; + case Clusters::BridgedDeviceBasicInformation::Id: { + using namespace Clusters::BridgedDeviceBasicInformation; switch (aPath.mAttributeId) { case Attributes::VendorName::Id: { using TypeInfo = Attributes::VendorName::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 6122c5cfbb9052..c57ca6bffeb87c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -5512,15 +5512,15 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @end /** - * Cluster Bridged Device Basic + * Cluster Bridged Device Basic Information * * This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on the Endpoint where it is placed (and its Parts) is bridged from a non-CHIP technology; and provide a centralized collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user, such as the vendor name, the model name, or user-assigned name. */ -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRBaseClusterBridgedDeviceBasic : MTRCluster +MTR_NEWLY_AVAILABLE +@interface MTRBaseClusterBridgedDeviceBasicInformation : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID @@ -17026,6 +17026,10 @@ MTR_NEWLY_DEPRECATED("Please use MTRBaseClusterOTASoftwareUpdateRequestor") @interface MTRBaseClusterOtaSoftwareUpdateRequestor : MTRBaseClusterOTASoftwareUpdateRequestor @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +@interface MTRBaseClusterBridgedDeviceBasic : MTRBaseClusterBridgedDeviceBasicInformation +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRBaseClusterWakeOnLAN") @interface MTRBaseClusterWakeOnLan : MTRBaseClusterWakeOnLAN diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 38e91ce6a7e511..dad95577ebaf7a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -36849,7 +36849,7 @@ - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device endpoint:(uint16 @end -@implementation MTRBaseClusterBridgedDeviceBasic +@implementation MTRBaseClusterBridgedDeviceBasicInformation - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -36867,7 +36867,7 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en - (void)readAttributeVendorNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorName::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -36876,7 +36876,7 @@ - (void)subscribeAttributeVendorNameWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorName::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -36892,7 +36892,7 @@ + (void)readAttributeVendorNameWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::VendorName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorName::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -36910,7 +36910,7 @@ + (void)readAttributeVendorNameWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeVendorIDWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorID::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -36919,7 +36919,7 @@ - (void)subscribeAttributeVendorIDWithParams:(MTRSubscribeParams * _Nonnull)para subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorID::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -36935,7 +36935,7 @@ + (void)readAttributeVendorIDWithClusterStateCache:(MTRClusterStateCacheContaine clusterStateCacheContainer.baseDevice, ^(VendorIdAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::VendorID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::VendorID::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -36953,7 +36953,7 @@ + (void)readAttributeVendorIDWithClusterStateCache:(MTRClusterStateCacheContaine - (void)readAttributeProductNameWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductName::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -36962,7 +36962,7 @@ - (void)subscribeAttributeProductNameWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductName::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -36978,7 +36978,7 @@ + (void)readAttributeProductNameWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductName::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductName::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -36996,7 +36996,7 @@ + (void)readAttributeProductNameWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeNodeLabelWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37028,11 +37028,11 @@ - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value } ListFreer listFreer; - using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo; TypeInfo::Type cppValue; cppValue = [self asCharSpan:value]; - chip::Controller::BridgedDeviceBasicCluster cppCluster(exchangeManager, session, self->_endpoint); + chip::Controller::BridgedDeviceBasicInformationCluster cppCluster(exchangeManager, session, self->_endpoint); return cppCluster.WriteAttribute(cppValue, bridge, successCb, failureCb, timedWriteTimeout); }); std::move(*bridge).DispatchAction(self.device); @@ -37042,7 +37042,7 @@ - (void)subscribeAttributeNodeLabelWithParams:(MTRSubscribeParams * _Nonnull)par subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37058,7 +37058,7 @@ + (void)readAttributeNodeLabelWithClusterStateCache:(MTRClusterStateCacheContain clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::NodeLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37076,7 +37076,7 @@ + (void)readAttributeNodeLabelWithClusterStateCache:(MTRClusterStateCacheContain - (void)readAttributeHardwareVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersion::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37085,7 +37085,7 @@ - (void)subscribeAttributeHardwareVersionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersion::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37102,7 +37102,7 @@ + (void)readAttributeHardwareVersionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersion::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37120,7 +37120,7 @@ + (void)readAttributeHardwareVersionWithClusterStateCache:(MTRClusterStateCacheC - (void)readAttributeHardwareVersionStringWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersionString::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37130,7 +37130,7 @@ - (void)subscribeAttributeHardwareVersionStringWithParams:(MTRSubscribeParams * reportHandler: (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersionString::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37147,7 +37147,7 @@ + (void)readAttributeHardwareVersionStringWithClusterStateCache:(MTRClusterState clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::HardwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::HardwareVersionString::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37165,7 +37165,7 @@ + (void)readAttributeHardwareVersionStringWithClusterStateCache:(MTRClusterState - (void)readAttributeSoftwareVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersion::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37174,7 +37174,7 @@ - (void)subscribeAttributeSoftwareVersionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersion::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37191,7 +37191,7 @@ + (void)readAttributeSoftwareVersionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int32uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersion::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersion::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37209,7 +37209,7 @@ + (void)readAttributeSoftwareVersionWithClusterStateCache:(MTRClusterStateCacheC - (void)readAttributeSoftwareVersionStringWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37219,7 +37219,7 @@ - (void)subscribeAttributeSoftwareVersionStringWithParams:(MTRSubscribeParams * reportHandler: (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37236,7 +37236,7 @@ + (void)readAttributeSoftwareVersionStringWithClusterStateCache:(MTRClusterState clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::SoftwareVersionString::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37254,7 +37254,7 @@ + (void)readAttributeSoftwareVersionStringWithClusterStateCache:(MTRClusterState - (void)readAttributeManufacturingDateWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ManufacturingDate::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37263,7 +37263,7 @@ - (void)subscribeAttributeManufacturingDateWithParams:(MTRSubscribeParams * _Non subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ManufacturingDate::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37280,7 +37280,7 @@ + (void)readAttributeManufacturingDateWithClusterStateCache:(MTRClusterStateCach clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::ManufacturingDate::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ManufacturingDate::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37298,7 +37298,7 @@ + (void)readAttributeManufacturingDateWithClusterStateCache:(MTRClusterStateCach - (void)readAttributePartNumberWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::PartNumber::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37307,7 +37307,7 @@ - (void)subscribeAttributePartNumberWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::PartNumber::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37323,7 +37323,7 @@ + (void)readAttributePartNumberWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::PartNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::PartNumber::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37341,7 +37341,7 @@ + (void)readAttributePartNumberWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeProductURLWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductURL::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37350,7 +37350,7 @@ - (void)subscribeAttributeProductURLWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductURL::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37366,7 +37366,7 @@ + (void)readAttributeProductURLWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductURL::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductURL::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37384,7 +37384,7 @@ + (void)readAttributeProductURLWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeProductLabelWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductLabel::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37393,7 +37393,7 @@ - (void)subscribeAttributeProductLabelWithParams:(MTRSubscribeParams * _Nonnull) subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductLabel::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37409,7 +37409,7 @@ + (void)readAttributeProductLabelWithClusterStateCache:(MTRClusterStateCacheCont clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::ProductLabel::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ProductLabel::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37427,7 +37427,7 @@ + (void)readAttributeProductLabelWithClusterStateCache:(MTRClusterStateCacheCont - (void)readAttributeSerialNumberWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SerialNumber::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37436,7 +37436,7 @@ - (void)subscribeAttributeSerialNumberWithParams:(MTRSubscribeParams * _Nonnull) subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SerialNumber::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37452,7 +37452,7 @@ + (void)readAttributeSerialNumberWithClusterStateCache:(MTRClusterStateCacheCont clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::SerialNumber::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::SerialNumber::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37470,7 +37470,7 @@ + (void)readAttributeSerialNumberWithClusterStateCache:(MTRClusterStateCacheCont - (void)readAttributeReachableWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::Reachable::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37479,7 +37479,7 @@ - (void)subscribeAttributeReachableWithParams:(MTRSubscribeParams * _Nonnull)par subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::Reachable::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37495,7 +37495,7 @@ + (void)readAttributeReachableWithClusterStateCache:(MTRClusterStateCacheContain clusterStateCacheContainer.baseDevice, ^(BooleanAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::Reachable::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::Reachable::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37513,7 +37513,7 @@ + (void)readAttributeReachableWithClusterStateCache:(MTRClusterStateCacheContain - (void)readAttributeUniqueIDWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::UniqueID::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37522,7 +37522,7 @@ - (void)subscribeAttributeUniqueIDWithParams:(MTRSubscribeParams * _Nonnull)para subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::UniqueID::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37538,7 +37538,7 @@ + (void)readAttributeUniqueIDWithClusterStateCache:(MTRClusterStateCacheContaine clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::UniqueID::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::UniqueID::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37556,8 +37556,9 @@ + (void)readAttributeUniqueIDWithClusterStateCache:(MTRClusterStateCacheContaine - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37566,8 +37567,8 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _ reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37578,12 +37579,12 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(BridgedDeviceBasicGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(BridgedDeviceBasicInformationGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::GeneratedCommandList::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37601,8 +37602,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37611,8 +37613,8 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37623,12 +37625,12 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(BridgedDeviceBasicAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(BridgedDeviceBasicInformationAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::AcceptedCommandList::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37646,8 +37648,9 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = BridgedDeviceBasicInformation::Attributes::AttributeList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37655,8 +37658,8 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37666,12 +37669,12 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(BridgedDeviceBasicAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(BridgedDeviceBasicInformationAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::AttributeList::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::AttributeList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37689,7 +37692,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::FeatureMap::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37698,7 +37701,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::FeatureMap::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37714,7 +37717,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(Int32uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::FeatureMap::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::FeatureMap::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37732,7 +37735,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ClusterRevision::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -37741,7 +37744,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ClusterRevision::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -37758,7 +37761,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = BridgedDeviceBasic::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = BridgedDeviceBasicInformation::Attributes::ClusterRevision::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -37775,6 +37778,9 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @end +@implementation MTRBaseClusterBridgedDeviceBasic +@end + @implementation MTRBaseClusterBridgedDeviceBasic (Deprecated) - (void)readAttributeVendorNameWithCompletionHandler:(void (^)( diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h index 82aab36933967d..da38cd3855be2b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h @@ -157,7 +157,7 @@ @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end -@interface MTRBaseClusterBridgedDeviceBasic () +@interface MTRBaseClusterBridgedDeviceBasicInformation () @property (nonatomic, strong, readonly) MTRBaseDevice * device; @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index c3d79ef81d5c97..34f1bc5f58aca0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -779,11 +779,11 @@ typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbac void * context, const chip::app::DataModel::DecodableList & data); typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); @@ -5622,100 +5622,104 @@ class MTREthernetNetworkDiagnosticsAttributeListListAttributeCallbackSubscriptio MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge - : public MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge +class MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackSubscriptionBridge + : public MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge { public: - MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge( + MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge::OnDone; + using MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge - : public MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge +class MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackSubscriptionBridge + : public MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge { public: - MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge( + MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge::OnDone; + using MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge - : public MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge +class MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackSubscriptionBridge + : public MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge { public: - MTRBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge( + MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge(queue, handler, action), + MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge::OnDone; + using MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index af6b57bc696872..27e8dabf796129 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -5105,7 +5105,7 @@ } } -void MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -5128,7 +5128,7 @@ DispatchSuccess(context, objCValue); }; -void MTRBridgedDeviceBasicGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRBridgedDeviceBasicInformationGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -5143,7 +5143,7 @@ } } -void MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -5166,7 +5166,7 @@ DispatchSuccess(context, objCValue); }; -void MTRBridgedDeviceBasicAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRBridgedDeviceBasicInformationAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -5181,7 +5181,7 @@ } } -void MTRBridgedDeviceBasicAttributeListListAttributeCallbackBridge::OnSuccessFn( +void MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -5204,7 +5204,7 @@ DispatchSuccess(context, objCValue); }; -void MTRBridgedDeviceBasicAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRBridgedDeviceBasicInformationAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 951a44b5ae611b..174440d0c82f7f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -109,7 +109,7 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeTimeSynchronizationID") = 0x00000038, MTRClusterBridgedDeviceBasicID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeBridgedDeviceBasicID") + MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeBridgedDeviceBasicInformationID") = 0x00000039, MTRClusterSwitchID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeSwitchID") @@ -263,7 +263,7 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterIDTypeWiFiNetworkDiagnosticsID MTR_NEWLY_AVAILABLE = 0x00000036, MTRClusterIDTypeEthernetNetworkDiagnosticsID MTR_NEWLY_AVAILABLE = 0x00000037, MTRClusterIDTypeTimeSynchronizationID MTR_NEWLY_AVAILABLE = 0x00000038, - MTRClusterIDTypeBridgedDeviceBasicID MTR_NEWLY_AVAILABLE = 0x00000039, + MTRClusterIDTypeBridgedDeviceBasicInformationID MTR_NEWLY_AVAILABLE = 0x00000039, MTRClusterIDTypeSwitchID MTR_NEWLY_AVAILABLE = 0x0000003B, MTRClusterIDTypeAdministratorCommissioningID MTR_NEWLY_AVAILABLE = 0x0000003C, MTRClusterIDTypeOperationalCredentialsID MTR_NEWLY_AVAILABLE = 0x0000003E, @@ -2137,91 +2137,91 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { // Cluster BridgedDeviceBasic deprecated attribute names MTRClusterBridgedDeviceBasicAttributeVendorNameID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorNameID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorNameID") = 0x00000001, MTRClusterBridgedDeviceBasicAttributeVendorIDID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorIDID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorIDID") = 0x00000002, MTRClusterBridgedDeviceBasicAttributeProductNameID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductNameID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductNameID") = 0x00000003, MTRClusterBridgedDeviceBasicAttributeNodeLabelID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeNodeLabelID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeNodeLabelID") = 0x00000005, MTRClusterBridgedDeviceBasicAttributeHardwareVersionID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionID") = 0x00000007, MTRClusterBridgedDeviceBasicAttributeHardwareVersionStringID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionStringID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionStringID") = 0x00000008, MTRClusterBridgedDeviceBasicAttributeSoftwareVersionID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionID") = 0x00000009, MTRClusterBridgedDeviceBasicAttributeSoftwareVersionStringID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionStringID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionStringID") = 0x0000000A, MTRClusterBridgedDeviceBasicAttributeManufacturingDateID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeManufacturingDateID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeManufacturingDateID") = 0x0000000B, MTRClusterBridgedDeviceBasicAttributePartNumberID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributePartNumberID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributePartNumberID") = 0x0000000C, MTRClusterBridgedDeviceBasicAttributeProductURLID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductURLID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductURLID") = 0x0000000D, MTRClusterBridgedDeviceBasicAttributeProductLabelID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductLabelID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductLabelID") = 0x0000000E, MTRClusterBridgedDeviceBasicAttributeSerialNumberID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSerialNumberID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSerialNumberID") = 0x0000000F, MTRClusterBridgedDeviceBasicAttributeReachableID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeReachableID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeReachableID") = 0x00000011, MTRClusterBridgedDeviceBasicAttributeUniqueIDID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeUniqueIDID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeUniqueIDID") = 0x00000012, MTRClusterBridgedDeviceBasicAttributeGeneratedCommandListID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeGeneratedCommandListID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeGeneratedCommandListID") = MTRClusterGlobalAttributeGeneratedCommandListID, MTRClusterBridgedDeviceBasicAttributeAcceptedCommandListID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAcceptedCommandListID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAcceptedCommandListID") = MTRClusterGlobalAttributeAcceptedCommandListID, MTRClusterBridgedDeviceBasicAttributeAttributeListID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAttributeListID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAttributeListID") = MTRClusterGlobalAttributeAttributeListID, MTRClusterBridgedDeviceBasicAttributeFeatureMapID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeFeatureMapID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeFeatureMapID") = MTRClusterGlobalAttributeFeatureMapID, MTRClusterBridgedDeviceBasicAttributeClusterRevisionID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeClusterRevisionID") + MTR_NEWLY_DEPRECATED("Please use MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeClusterRevisionID") = MTRClusterGlobalAttributeClusterRevisionID, - // Cluster BridgedDeviceBasic attributes - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorNameID MTR_NEWLY_AVAILABLE = 0x00000001, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorIDID MTR_NEWLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductNameID MTR_NEWLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeNodeLabelID MTR_NEWLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionID MTR_NEWLY_AVAILABLE = 0x00000007, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionStringID MTR_NEWLY_AVAILABLE = 0x00000008, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionID MTR_NEWLY_AVAILABLE = 0x00000009, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionStringID MTR_NEWLY_AVAILABLE = 0x0000000A, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeManufacturingDateID MTR_NEWLY_AVAILABLE = 0x0000000B, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributePartNumberID MTR_NEWLY_AVAILABLE = 0x0000000C, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductURLID MTR_NEWLY_AVAILABLE = 0x0000000D, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductLabelID MTR_NEWLY_AVAILABLE = 0x0000000E, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSerialNumberID MTR_NEWLY_AVAILABLE = 0x0000000F, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeReachableID MTR_NEWLY_AVAILABLE = 0x00000011, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeUniqueIDID MTR_NEWLY_AVAILABLE = 0x00000012, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE + // Cluster BridgedDeviceBasicInformation attributes + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorNameID MTR_NEWLY_AVAILABLE = 0x00000001, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorIDID MTR_NEWLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductNameID MTR_NEWLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeNodeLabelID MTR_NEWLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionID MTR_NEWLY_AVAILABLE = 0x00000007, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionStringID MTR_NEWLY_AVAILABLE = 0x00000008, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionID MTR_NEWLY_AVAILABLE = 0x00000009, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionStringID MTR_NEWLY_AVAILABLE = 0x0000000A, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeManufacturingDateID MTR_NEWLY_AVAILABLE = 0x0000000B, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributePartNumberID MTR_NEWLY_AVAILABLE = 0x0000000C, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductURLID MTR_NEWLY_AVAILABLE = 0x0000000D, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductLabelID MTR_NEWLY_AVAILABLE = 0x0000000E, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSerialNumberID MTR_NEWLY_AVAILABLE = 0x0000000F, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeReachableID MTR_NEWLY_AVAILABLE = 0x00000011, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeUniqueIDID MTR_NEWLY_AVAILABLE = 0x00000012, + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAttributeListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAttributeListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeFeatureMapID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeFeatureMapID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, - MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeClusterRevisionID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, // Cluster Switch deprecated attribute names @@ -6865,23 +6865,23 @@ typedef NS_ENUM(uint32_t, MTREventIDType) { // Cluster BridgedDeviceBasic deprecated event names MTRClusterBridgedDeviceBasicEventStartUpID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicEventStartUpID") + MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicInformationEventStartUpID") = 0x00000000, MTRClusterBridgedDeviceBasicEventShutDownID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicEventShutDownID") + MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicInformationEventShutDownID") = 0x00000001, MTRClusterBridgedDeviceBasicEventLeaveID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicEventLeaveID") + MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicInformationEventLeaveID") = 0x00000002, MTRClusterBridgedDeviceBasicEventReachableChangedID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicEventReachableChangedID") + MTR_NEWLY_DEPRECATED("Please use MTREventIDTypeClusterBridgedDeviceBasicInformationEventReachableChangedID") = 0x00000003, - // Cluster BridgedDeviceBasic events - MTREventIDTypeClusterBridgedDeviceBasicEventStartUpID MTR_NEWLY_AVAILABLE = 0x00000000, - MTREventIDTypeClusterBridgedDeviceBasicEventShutDownID MTR_NEWLY_AVAILABLE = 0x00000001, - MTREventIDTypeClusterBridgedDeviceBasicEventLeaveID MTR_NEWLY_AVAILABLE = 0x00000002, - MTREventIDTypeClusterBridgedDeviceBasicEventReachableChangedID MTR_NEWLY_AVAILABLE = 0x00000003, + // Cluster BridgedDeviceBasicInformation events + MTREventIDTypeClusterBridgedDeviceBasicInformationEventStartUpID MTR_NEWLY_AVAILABLE = 0x00000000, + MTREventIDTypeClusterBridgedDeviceBasicInformationEventShutDownID MTR_NEWLY_AVAILABLE = 0x00000001, + MTREventIDTypeClusterBridgedDeviceBasicInformationEventLeaveID MTR_NEWLY_AVAILABLE = 0x00000002, + MTREventIDTypeClusterBridgedDeviceBasicInformationEventReachableChangedID MTR_NEWLY_AVAILABLE = 0x00000003, // Cluster Switch deprecated event names MTRClusterSwitchEventSwitchLatchedID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index c374d5bc9a260e..cfbd8aec4912f1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2052,85 +2052,65 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @end /** - * Cluster Bridged Device Basic + * Cluster Bridged Device Basic Information * This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on the Endpoint where it is placed (and its Parts) is bridged from a non-CHIP technology; and provide a centralized collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user, such as the vendor name, the model name, or user-assigned name. */ -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRClusterBridgedDeviceBasic : MTRCluster +MTR_NEWLY_AVAILABLE +@interface MTRClusterBridgedDeviceBasicInformation : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeVendorIDWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeVendorIDWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeProductNameWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeProductNameWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeNodeLabelWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeNodeLabelWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (void)writeAttributeNodeLabelWithValue:(NSDictionary *)dataValueDictionary - expectedValueInterval:(NSNumber *)expectedValueIntervalMs - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_NEWLY_AVAILABLE; - (void)writeAttributeNodeLabelWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs - params:(MTRWriteParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + params:(MTRWriteParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeHardwareVersionWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeHardwareVersionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeHardwareVersionStringWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeSoftwareVersionWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeSoftwareVersionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeSoftwareVersionStringWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeManufacturingDateWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeManufacturingDateWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributePartNumberWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributePartNumberWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeProductURLWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeProductURLWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeProductLabelWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeProductLabelWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeSerialNumberWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeSerialNumberWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeReachableWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeReachableWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeUniqueIDWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeUniqueIDWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; -- (NSDictionary *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params - API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - (instancetype)init NS_UNAVAILABLE; + (instancetype)new NS_UNAVAILABLE; @@ -6623,6 +6603,10 @@ MTR_NEWLY_DEPRECATED("Please use MTRClusterOTASoftwareUpdateRequestor") @interface MTRClusterOtaSoftwareUpdateRequestor : MTRClusterOTASoftwareUpdateRequestor @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +@interface MTRClusterBridgedDeviceBasic : MTRClusterBridgedDeviceBasicInformation +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRClusterWakeOnLAN") @interface MTRClusterWakeOnLan : MTRClusterWakeOnLAN diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 4c077cf69584dc..aaab6bc2f3ae14 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -9462,7 +9462,7 @@ - (void)resetCountsWithExpectedValues:(NSArray *> * } @end -@implementation MTRClusterBridgedDeviceBasic +@implementation MTRClusterBridgedDeviceBasicInformation - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -9480,32 +9480,32 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi - (NSDictionary *)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorNameID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorNameID) params:params]; } - (NSDictionary *)readAttributeVendorIDWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeVendorIDID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeVendorIDID) params:params]; } - (NSDictionary *)readAttributeProductNameWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductNameID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductNameID) params:params]; } - (NSDictionary *)readAttributeNodeLabelWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeNodeLabelID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeNodeLabelID) params:params]; } @@ -9521,8 +9521,8 @@ - (void)writeAttributeNodeLabelWithValue:(NSDictionary *)dataVal NSNumber * timedWriteTimeout = params.timedWriteTimeout; [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeNodeLabelID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeNodeLabelID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -9530,132 +9530,143 @@ - (void)writeAttributeNodeLabelWithValue:(NSDictionary *)dataVal - (NSDictionary *)readAttributeHardwareVersionWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionID) - params:params]; + return + [self.device readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionID) + params:params]; } - (NSDictionary *)readAttributeHardwareVersionStringWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeHardwareVersionStringID) - params:params]; + return [self.device + readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeHardwareVersionStringID) + params:params]; } - (NSDictionary *)readAttributeSoftwareVersionWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionID) - params:params]; + return + [self.device readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionID) + params:params]; } - (NSDictionary *)readAttributeSoftwareVersionStringWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSoftwareVersionStringID) - params:params]; + return [self.device + readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSoftwareVersionStringID) + params:params]; } - (NSDictionary *)readAttributeManufacturingDateWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeManufacturingDateID) - params:params]; + return [self.device + readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeManufacturingDateID) + params:params]; } - (NSDictionary *)readAttributePartNumberWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributePartNumberID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributePartNumberID) params:params]; } - (NSDictionary *)readAttributeProductURLWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductURLID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductURLID) params:params]; } - (NSDictionary *)readAttributeProductLabelWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeProductLabelID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeProductLabelID) params:params]; } - (NSDictionary *)readAttributeSerialNumberWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeSerialNumberID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeSerialNumberID) params:params]; } - (NSDictionary *)readAttributeReachableWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeReachableID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeReachableID) params:params]; } - (NSDictionary *)readAttributeUniqueIDWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeUniqueIDID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeUniqueIDID) params:params]; } - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeGeneratedCommandListID) - params:params]; + return [self.device + readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeGeneratedCommandListID) + params:params]; } - (NSDictionary *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAcceptedCommandListID) - params:params]; + return [self.device + readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAcceptedCommandListID) + params:params]; } - (NSDictionary *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeAttributeListID) - params:params]; + return + [self.device readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeAttributeListID) + params:params]; } - (NSDictionary *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeFeatureMapID) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeFeatureMapID) params:params]; } - (NSDictionary *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBridgedDeviceBasicID) - attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicAttributeClusterRevisionID) - params:params]; + return + [self.device readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeBridgedDeviceBasicInformationID) + attributeID:@(MTRAttributeIDTypeClusterBridgedDeviceBasicInformationAttributeClusterRevisionID) + params:params]; } +@end +@implementation MTRClusterBridgedDeviceBasic @end @implementation MTRClusterBridgedDeviceBasic (Deprecated) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h index a27a9e49d2369a..01db1693d8f8e5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h @@ -158,7 +158,7 @@ @property (nonatomic, readonly) MTRDevice * device; @end -@interface MTRClusterBridgedDeviceBasic () +@interface MTRClusterBridgedDeviceBasicInformation () @property (nonatomic, readonly) uint16_t endpoint; @property (nonatomic, readonly) MTRDevice * device; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index a2fa781704a557..301203c3f7bced 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -1201,8 +1201,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead } break; } - case Clusters::BridgedDeviceBasic::Id: { - using namespace Clusters::BridgedDeviceBasic; + case Clusters::BridgedDeviceBasicInformation::Id: { + using namespace Clusters::BridgedDeviceBasicInformation; switch (aPath.mEventId) { case Events::StartUp::Id: { @@ -1212,7 +1212,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead return nil; } - __auto_type * value = [MTRBridgedDeviceBasicClusterStartUpEvent new]; + __auto_type * value = [MTRBridgedDeviceBasicInformationClusterStartUpEvent new]; do { NSNumber * _Nonnull memberValue; @@ -1230,7 +1230,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead return nil; } - __auto_type * value = [MTRBridgedDeviceBasicClusterShutDownEvent new]; + __auto_type * value = [MTRBridgedDeviceBasicInformationClusterShutDownEvent new]; return value; } @@ -1242,7 +1242,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead return nil; } - __auto_type * value = [MTRBridgedDeviceBasicClusterLeaveEvent new]; + __auto_type * value = [MTRBridgedDeviceBasicInformationClusterLeaveEvent new]; return value; } @@ -1254,7 +1254,7 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead return nil; } - __auto_type * value = [MTRBridgedDeviceBasicClusterReachableChangedEvent new]; + __auto_type * value = [MTRBridgedDeviceBasicInformationClusterReachableChangedEvent new]; do { NSNumber * _Nonnull memberValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index f25c0a264de5de..62303563e73931 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -480,22 +480,38 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSString * _Nullable name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end +MTR_NEWLY_AVAILABLE +@interface MTRBridgedDeviceBasicInformationClusterStartUpEvent : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull softwareVersion MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRBridgedDeviceBasicClusterStartUpEvent : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull softwareVersion API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@interface MTRBridgedDeviceBasicClusterStartUpEvent : MTRBridgedDeviceBasicInformationClusterStartUpEvent +@end + +MTR_NEWLY_AVAILABLE +@interface MTRBridgedDeviceBasicInformationClusterShutDownEvent : NSObject @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRBridgedDeviceBasicClusterShutDownEvent : NSObject +@interface MTRBridgedDeviceBasicClusterShutDownEvent : MTRBridgedDeviceBasicInformationClusterShutDownEvent +@end + +MTR_NEWLY_AVAILABLE +@interface MTRBridgedDeviceBasicInformationClusterLeaveEvent : NSObject @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRBridgedDeviceBasicClusterLeaveEvent : NSObject +@interface MTRBridgedDeviceBasicClusterLeaveEvent : MTRBridgedDeviceBasicInformationClusterLeaveEvent +@end + +MTR_NEWLY_AVAILABLE +@interface MTRBridgedDeviceBasicInformationClusterReachableChangedEvent : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull reachableNewValue MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRBridgedDeviceBasicClusterReachableChangedEvent : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull reachableNewValue API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@interface MTRBridgedDeviceBasicClusterReachableChangedEvent : MTRBridgedDeviceBasicInformationClusterReachableChangedEvent @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 03e854a2c5bfb3..7742285fdc5808 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -1859,7 +1859,7 @@ - (NSString *)description @end -@implementation MTRBridgedDeviceBasicClusterStartUpEvent +@implementation MTRBridgedDeviceBasicInformationClusterStartUpEvent - (instancetype)init { if (self = [super init]) { @@ -1871,7 +1871,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRBridgedDeviceBasicClusterStartUpEvent alloc] init]; + auto other = [[MTRBridgedDeviceBasicInformationClusterStartUpEvent alloc] init]; other.softwareVersion = self.softwareVersion; @@ -1887,7 +1887,10 @@ - (NSString *)description @end -@implementation MTRBridgedDeviceBasicClusterShutDownEvent +@implementation MTRBridgedDeviceBasicClusterStartUpEvent : MTRBridgedDeviceBasicInformationClusterStartUpEvent +@end + +@implementation MTRBridgedDeviceBasicInformationClusterShutDownEvent - (instancetype)init { if (self = [super init]) { @@ -1897,7 +1900,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRBridgedDeviceBasicClusterShutDownEvent alloc] init]; + auto other = [[MTRBridgedDeviceBasicInformationClusterShutDownEvent alloc] init]; return other; } @@ -1910,7 +1913,10 @@ - (NSString *)description @end -@implementation MTRBridgedDeviceBasicClusterLeaveEvent +@implementation MTRBridgedDeviceBasicClusterShutDownEvent : MTRBridgedDeviceBasicInformationClusterShutDownEvent +@end + +@implementation MTRBridgedDeviceBasicInformationClusterLeaveEvent - (instancetype)init { if (self = [super init]) { @@ -1920,7 +1926,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRBridgedDeviceBasicClusterLeaveEvent alloc] init]; + auto other = [[MTRBridgedDeviceBasicInformationClusterLeaveEvent alloc] init]; return other; } @@ -1933,7 +1939,10 @@ - (NSString *)description @end -@implementation MTRBridgedDeviceBasicClusterReachableChangedEvent +@implementation MTRBridgedDeviceBasicClusterLeaveEvent : MTRBridgedDeviceBasicInformationClusterLeaveEvent +@end + +@implementation MTRBridgedDeviceBasicInformationClusterReachableChangedEvent - (instancetype)init { if (self = [super init]) { @@ -1945,7 +1954,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRBridgedDeviceBasicClusterReachableChangedEvent alloc] init]; + auto other = [[MTRBridgedDeviceBasicInformationClusterReachableChangedEvent alloc] init]; other.reachableNewValue = self.reachableNewValue; @@ -1961,6 +1970,9 @@ - (NSString *)description @end +@implementation MTRBridgedDeviceBasicClusterReachableChangedEvent : MTRBridgedDeviceBasicInformationClusterReachableChangedEvent +@end + @implementation MTRSwitchClusterSwitchLatchedEvent - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index cb7512e30ddd36..2c74408c647fe6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -438,7 +438,7 @@ #define ZCL_TIME_ZONE_DATABASE_ATTRIBUTE_ID (0x0008) #define ZCL_NTP_SERVER_PORT_ATTRIBUTE_ID (0x0009) -// Attribute ids for cluster: Bridged Device Basic +// Attribute ids for cluster: Bridged Device Basic Information // Client attributes diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index b14c05369fffce..d4dcf029dee7be 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -9570,7 +9570,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Attributes { namespace VendorName { @@ -9578,7 +9578,8 @@ namespace VendorName { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9598,7 +9599,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace VendorName @@ -9609,8 +9611,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -9629,7 +9632,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_VENDOR_ID_ATTRIBUTE_TYPE); } } // namespace VendorID @@ -9639,7 +9643,8 @@ namespace ProductName { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9659,7 +9664,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace ProductName @@ -9669,7 +9675,8 @@ namespace NodeLabel { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9689,7 +9696,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace NodeLabel @@ -9700,8 +9708,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -9720,7 +9729,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace HardwareVersion @@ -9730,7 +9740,8 @@ namespace HardwareVersionString { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9750,7 +9761,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace HardwareVersionString @@ -9761,8 +9773,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -9781,7 +9794,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_INT32U_ATTRIBUTE_TYPE); } } // namespace SoftwareVersion @@ -9791,7 +9805,8 @@ namespace SoftwareVersionString { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9811,7 +9826,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace SoftwareVersionString @@ -9821,7 +9837,8 @@ namespace ManufacturingDate { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[16 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9841,7 +9858,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[16 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace ManufacturingDate @@ -9851,7 +9869,8 @@ namespace PartNumber { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9871,7 +9890,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace PartNumber @@ -9881,7 +9901,8 @@ namespace ProductURL { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[256 + 2]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfLongStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9901,7 +9922,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[256 + 2]; emberAfCopyInt16u(zclString, 0, static_cast(value.size())); memcpy(&zclString[2], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE); } @@ -9912,7 +9933,8 @@ namespace ProductLabel { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9932,7 +9954,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace ProductLabel @@ -9942,7 +9965,8 @@ namespace SerialNumber { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -9962,7 +9986,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace SerialNumber @@ -9973,8 +9998,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, bool * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -9993,7 +10019,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_BOOLEAN_ATTRIBUTE_TYPE); } } // namespace Reachable @@ -10003,7 +10030,8 @@ namespace UniqueID { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[32 + 1]; - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -10023,7 +10051,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[32 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString, + ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace UniqueID @@ -10034,8 +10063,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -10054,7 +10084,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -10065,8 +10096,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -10085,13 +10117,14 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, + ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 2303534ce5f682..761012b7c4d437 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1647,7 +1647,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Attributes { namespace VendorName { @@ -1736,7 +1736,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index d646734249827d..9179b57d48fa9c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -266,13 +266,13 @@ void emberAfEthernetNetworkDiagnosticsClusterInitCallback(chip::EndpointId endpo */ void emberAfTimeSynchronizationClusterInitCallback(chip::EndpointId endpoint); -/** @brief Bridged Device Basic Cluster Init +/** @brief Bridged Device Basic Information Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfBridgedDeviceBasicClusterInitCallback(chip::EndpointId endpoint); +void emberAfBridgedDeviceBasicInformationClusterInitCallback(chip::EndpointId endpoint); /** @brief Switch Cluster Init * @@ -3407,34 +3407,35 @@ void emberAfTimeSynchronizationClusterServerTickCallback(chip::EndpointId endpoi void emberAfTimeSynchronizationClusterClientTickCallback(chip::EndpointId endpoint); // -// Bridged Device Basic Cluster +// Bridged Device Basic Information Cluster // -/** @brief Bridged Device Basic Cluster Server Init +/** @brief Bridged Device Basic Information Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfBridgedDeviceBasicClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfBridgedDeviceBasicInformationClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Bridged Device Basic Cluster Client Init +/** @brief Bridged Device Basic Information Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfBridgedDeviceBasicClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfBridgedDeviceBasicInformationClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Bridged Device Basic Cluster Server Attribute Changed +/** @brief Bridged Device Basic Information Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterBridgedDeviceBasicClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterBridgedDeviceBasicInformationClusterServerAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bridged Device Basic Cluster Server Message Sent +/** @brief Bridged Device Basic Information Cluster Server Message Sent * * Server Message Sent * @@ -3444,11 +3445,11 @@ void MatterBridgedDeviceBasicClusterServerAttributeChangedCallback(const chip::a * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBridgedDeviceBasicClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfBridgedDeviceBasicInformationClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, + uint8_t * message, EmberStatus status); -/** @brief Bridged Device Basic Cluster Client Message Sent +/** @brief Bridged Device Basic Information Cluster Client Message Sent * * Client Message Sent * @@ -3458,11 +3459,11 @@ void emberAfBridgedDeviceBasicClusterServerMessageSentCallback(const chip::Messa * @param message The message that was sent * @param status The status of the sent message */ -void emberAfBridgedDeviceBasicClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); +void emberAfBridgedDeviceBasicInformationClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, + uint8_t * message, EmberStatus status); -/** @brief Bridged Device Basic Cluster Server Pre Attribute Changed +/** @brief Bridged Device Basic Information Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -3471,10 +3472,10 @@ void emberAfBridgedDeviceBasicClusterClientMessageSentCallback(const chip::Messa * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterBridgedDeviceBasicClusterServerPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status MatterBridgedDeviceBasicInformationClusterServerPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Bridged Device Basic Cluster Client Pre Attribute Changed +/** @brief Bridged Device Basic Information Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -3483,24 +3484,24 @@ chip::Protocols::InteractionModel::Status MatterBridgedDeviceBasicClusterServerP * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterBridgedDeviceBasicClusterClientPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status MatterBridgedDeviceBasicInformationClusterClientPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Bridged Device Basic Cluster Server Tick +/** @brief Bridged Device Basic Information Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfBridgedDeviceBasicClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfBridgedDeviceBasicInformationClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Bridged Device Basic Cluster Client Tick +/** @brief Bridged Device Basic Information Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfBridgedDeviceBasicClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfBridgedDeviceBasicInformationClusterClientTickCallback(chip::EndpointId endpoint); // // Switch Cluster diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index ac289043df913b..54907ffb5b9cac 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -928,7 +928,7 @@ enum class TimeSourceEnum : uint8_t }; } // namespace TimeSynchronization -namespace BridgedDeviceBasic {} // namespace BridgedDeviceBasic +namespace BridgedDeviceBasicInformation {} // namespace BridgedDeviceBasicInformation namespace Switch { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 7ce6f20f58620e..4bc4f7d511c09b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -8137,7 +8137,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Commands {} // namespace Commands @@ -8357,7 +8357,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace ReachableChanged. } // namespace Events -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Commands {} // namespace Commands diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 62a0fb93405645..021e2c7892ae78 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -10312,7 +10312,7 @@ struct TypeInfo }; } // namespace Attributes } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Attributes { @@ -10323,7 +10323,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::VendorName::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10336,7 +10336,7 @@ struct TypeInfo using DecodableType = chip::VendorId; using DecodableArgType = chip::VendorId; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::VendorID::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -10348,7 +10348,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ProductName::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10361,7 +10361,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::NodeLabel::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10374,7 +10374,7 @@ struct TypeInfo using DecodableType = uint16_t; using DecodableArgType = uint16_t; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::HardwareVersion::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -10386,7 +10386,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::HardwareVersionString::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -10399,7 +10399,7 @@ struct TypeInfo using DecodableType = uint32_t; using DecodableArgType = uint32_t; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareVersion::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -10411,7 +10411,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SoftwareVersionString::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -10424,7 +10424,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ManufacturingDate::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 16; } @@ -10437,7 +10437,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::PartNumber::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10450,7 +10450,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ProductURL::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 256; } @@ -10463,7 +10463,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ProductLabel::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -10476,7 +10476,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SerialNumber::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10489,7 +10489,7 @@ struct TypeInfo using DecodableType = bool; using DecodableArgType = bool; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Reachable::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -10501,7 +10501,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::UniqueID::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 32; } @@ -10510,31 +10510,31 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } }; } // namespace AcceptedCommandList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } }; } // namespace ClusterRevision @@ -10542,7 +10542,7 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); @@ -10583,7 +10583,7 @@ struct Type public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::StartUp::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr bool kIsFabricScoped = false; uint32_t softwareVersion = static_cast(0); @@ -10596,7 +10596,7 @@ struct DecodableType public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::StartUp::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } uint32_t softwareVersion = static_cast(0); @@ -10615,7 +10615,7 @@ struct Type public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::ShutDown::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr bool kIsFabricScoped = false; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -10626,7 +10626,7 @@ struct DecodableType public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::ShutDown::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -10643,7 +10643,7 @@ struct Type public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::Leave::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr bool kIsFabricScoped = false; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -10654,7 +10654,7 @@ struct DecodableType public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::Leave::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -10672,7 +10672,7 @@ struct Type public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::ReachableChanged::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } static constexpr bool kIsFabricScoped = false; bool reachableNewValue = static_cast(0); @@ -10685,7 +10685,7 @@ struct DecodableType public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::ReachableChanged::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasic::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::BridgedDeviceBasicInformation::Id; } bool reachableNewValue = static_cast(0); @@ -10693,7 +10693,7 @@ struct DecodableType }; } // namespace ReachableChanged } // namespace Events -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index f04936cff351f7..1617c26d2fc489 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -1745,7 +1745,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Attributes { namespace VendorName { @@ -1829,7 +1829,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h index e691cc85cd4487..7cb0e515bbf007 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h @@ -112,9 +112,9 @@ static constexpr ClusterId Id = 0x00000037; namespace TimeSynchronization { static constexpr ClusterId Id = 0x00000038; } // namespace TimeSynchronization -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { static constexpr ClusterId Id = 0x00000039; -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { static constexpr ClusterId Id = 0x0000003B; } // namespace Switch diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h index e885f58360f248..743778bab8bd1f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h @@ -175,7 +175,7 @@ static constexpr EventId Id = 0x00000002; } // namespace Events } // namespace WiFiNetworkDiagnostics -namespace BridgedDeviceBasic { +namespace BridgedDeviceBasicInformation { namespace Events { namespace StartUp { @@ -195,7 +195,7 @@ static constexpr EventId Id = 0x00000003; } // namespace ReachableChanged } // namespace Events -} // namespace BridgedDeviceBasic +} // namespace BridgedDeviceBasicInformation namespace Switch { namespace Events { diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index a559ec1c8e2dfb..ed7dedb5a5d63b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -210,10 +210,12 @@ #define CHIP_PRINTCLUSTER_TIME_SYNCHRONIZATION_CLUSTER #endif -#if defined(ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER { chip::app::Clusters::BridgedDeviceBasic::Id, "Bridged Device Basic" }, +#if defined(ZCL_USING_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_SERVER) || \ + defined(ZCL_USING_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER \ + { chip::app::Clusters::BridgedDeviceBasicInformation::Id, "Bridged Device Basic Information" }, #else -#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER +#define CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER #endif #if defined(ZCL_USING_SWITCH_CLUSTER_SERVER) || defined(ZCL_USING_SWITCH_CLUSTER_CLIENT) @@ -509,7 +511,7 @@ CHIP_PRINTCLUSTER_WIFI_NETWORK_DIAGNOSTICS_CLUSTER \ CHIP_PRINTCLUSTER_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER \ CHIP_PRINTCLUSTER_TIME_SYNCHRONIZATION_CLUSTER \ - CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_CLUSTER \ + CHIP_PRINTCLUSTER_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER \ CHIP_PRINTCLUSTER_SWITCH_CLUSTER \ CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER \ CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index fe85a94a241f75..3b127ff1559d80 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -62,7 +62,7 @@ | WiFiNetworkDiagnostics | 0x0036 | | EthernetNetworkDiagnostics | 0x0037 | | TimeSynchronization | 0x0038 | -| BridgedDeviceBasic | 0x0039 | +| BridgedDeviceBasicInformation | 0x0039 | | Switch | 0x003B | | AdministratorCommissioning | 0x003C | | OperationalCredentials | 0x003E | @@ -2969,7 +2969,7 @@ class TimeSynchronizationSetUtcTime : public ClusterCommand }; /*----------------------------------------------------------------------------*\ -| Cluster BridgedDeviceBasic | 0x0039 | +| Cluster BridgedDeviceBasicInformation | 0x0039 | |------------------------------------------------------------------------------| | Commands: | | |------------------------------------------------------------------------------| @@ -10094,11 +10094,11 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom commands.Register(clusterName, clusterCommands); } -void registerClusterBridgedDeviceBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterBridgedDeviceBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::BridgedDeviceBasic; + using namespace chip::app::Clusters::BridgedDeviceBasicInformation; - const char * clusterName = "BridgedDeviceBasic"; + const char * clusterName = "BridgedDeviceBasicInformation"; commands_list clusterCommands = { // @@ -13561,7 +13561,7 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterWiFiNetworkDiagnostics(commands, credsIssuerConfig); registerClusterEthernetNetworkDiagnostics(commands, credsIssuerConfig); registerClusterTimeSynchronization(commands, credsIssuerConfig); - registerClusterBridgedDeviceBasic(commands, credsIssuerConfig); + registerClusterBridgedDeviceBasicInformation(commands, credsIssuerConfig); registerClusterSwitch(commands, credsIssuerConfig); registerClusterAdministratorCommissioning(commands, credsIssuerConfig); registerClusterOperationalCredentials(commands, credsIssuerConfig); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 1545849d5e6b5b..1436ecff634745 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -3061,7 +3061,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 BridgedDeviceBasic::Events::StartUp::DecodableType & value) + const BridgedDeviceBasicInformation::Events::StartUp::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -3077,7 +3077,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 BridgedDeviceBasic::Events::ShutDown::DecodableType & value) + const BridgedDeviceBasicInformation::Events::ShutDown::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); DataModelLogger::LogString(indent, "}"); @@ -3085,7 +3085,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 BridgedDeviceBasic::Events::Leave::DecodableType & value) + const BridgedDeviceBasicInformation::Events::Leave::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); DataModelLogger::LogString(indent, "}"); @@ -3093,7 +3093,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 BridgedDeviceBasic::Events::ReachableChanged::DecodableType & value) + const BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -6251,105 +6251,105 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case BridgedDeviceBasic::Id: { + case BridgedDeviceBasicInformation::Id: { switch (path.mAttributeId) { - case BridgedDeviceBasic::Attributes::VendorName::Id: { + case BridgedDeviceBasicInformation::Attributes::VendorName::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("VendorName", 1, value); } - case BridgedDeviceBasic::Attributes::VendorID::Id: { + case BridgedDeviceBasicInformation::Attributes::VendorID::Id: { chip::VendorId value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("VendorID", 1, value); } - case BridgedDeviceBasic::Attributes::ProductName::Id: { + case BridgedDeviceBasicInformation::Attributes::ProductName::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductName", 1, value); } - case BridgedDeviceBasic::Attributes::NodeLabel::Id: { + case BridgedDeviceBasicInformation::Attributes::NodeLabel::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("NodeLabel", 1, value); } - case BridgedDeviceBasic::Attributes::HardwareVersion::Id: { + case BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("HardwareVersion", 1, value); } - case BridgedDeviceBasic::Attributes::HardwareVersionString::Id: { + case BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("HardwareVersionString", 1, value); } - case BridgedDeviceBasic::Attributes::SoftwareVersion::Id: { + case BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SoftwareVersion", 1, value); } - case BridgedDeviceBasic::Attributes::SoftwareVersionString::Id: { + case BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SoftwareVersionString", 1, value); } - case BridgedDeviceBasic::Attributes::ManufacturingDate::Id: { + case BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ManufacturingDate", 1, value); } - case BridgedDeviceBasic::Attributes::PartNumber::Id: { + case BridgedDeviceBasicInformation::Attributes::PartNumber::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("PartNumber", 1, value); } - case BridgedDeviceBasic::Attributes::ProductURL::Id: { + case BridgedDeviceBasicInformation::Attributes::ProductURL::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductURL", 1, value); } - case BridgedDeviceBasic::Attributes::ProductLabel::Id: { + case BridgedDeviceBasicInformation::Attributes::ProductLabel::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ProductLabel", 1, value); } - case BridgedDeviceBasic::Attributes::SerialNumber::Id: { + case BridgedDeviceBasicInformation::Attributes::SerialNumber::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SerialNumber", 1, value); } - case BridgedDeviceBasic::Attributes::Reachable::Id: { + case BridgedDeviceBasicInformation::Attributes::Reachable::Id: { bool value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Reachable", 1, value); } - case BridgedDeviceBasic::Attributes::UniqueID::Id: { + case BridgedDeviceBasicInformation::Attributes::UniqueID::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("UniqueID", 1, value); } - case BridgedDeviceBasic::Attributes::GeneratedCommandList::Id: { + case BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case BridgedDeviceBasic::Attributes::AcceptedCommandList::Id: { + case BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case BridgedDeviceBasic::Attributes::AttributeList::Id: { + case BridgedDeviceBasicInformation::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case BridgedDeviceBasic::Attributes::FeatureMap::Id: { + case BridgedDeviceBasicInformation::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case BridgedDeviceBasic::Attributes::ClusterRevision::Id: { + case BridgedDeviceBasicInformation::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -10792,26 +10792,26 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip } break; } - case BridgedDeviceBasic::Id: { + case BridgedDeviceBasicInformation::Id: { switch (header.mPath.mEventId) { - case BridgedDeviceBasic::Events::StartUp::Id: { - chip::app::Clusters::BridgedDeviceBasic::Events::StartUp::DecodableType value; + case BridgedDeviceBasicInformation::Events::StartUp::Id: { + chip::app::Clusters::BridgedDeviceBasicInformation::Events::StartUp::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUp", 1, value); } - case BridgedDeviceBasic::Events::ShutDown::Id: { - chip::app::Clusters::BridgedDeviceBasic::Events::ShutDown::DecodableType value; + case BridgedDeviceBasicInformation::Events::ShutDown::Id: { + chip::app::Clusters::BridgedDeviceBasicInformation::Events::ShutDown::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ShutDown", 1, value); } - case BridgedDeviceBasic::Events::Leave::Id: { - chip::app::Clusters::BridgedDeviceBasic::Events::Leave::DecodableType value; + case BridgedDeviceBasicInformation::Events::Leave::Id: { + chip::app::Clusters::BridgedDeviceBasicInformation::Events::Leave::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Leave", 1, value); } - case BridgedDeviceBasic::Events::ReachableChanged::Id: { - chip::app::Clusters::BridgedDeviceBasic::Events::ReachableChanged::DecodableType value; + case BridgedDeviceBasicInformation::Events::ReachableChanged::Id: { + chip::app::Clusters::BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ReachableChanged", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 077dece4c4c9c2..435728fd42589a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -192,13 +192,14 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::WiFiNetworkDiagnostics::Events::ConnectionStatus::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::BridgedDeviceBasic::Events::StartUp::DecodableType & value); + const chip::app::Clusters::BridgedDeviceBasicInformation::Events::StartUp::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::BridgedDeviceBasic::Events::ShutDown::DecodableType & value); + const chip::app::Clusters::BridgedDeviceBasicInformation::Events::ShutDown::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::BridgedDeviceBasic::Events::Leave::DecodableType & value); -static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::BridgedDeviceBasic::Events::ReachableChanged::DecodableType & value); + const chip::app::Clusters::BridgedDeviceBasicInformation::Events::Leave::DecodableType & value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::BridgedDeviceBasicInformation::Events::ReachableChanged::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Switch::Events::SwitchLatched::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index d3b1c485fd4325..108e2d6a411968 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -6601,112 +6601,112 @@ class Test_TC_BRBINFO_1_1Suite : public TestCommand } case 1: { LogStep(1, "TH reads the ClusterRevision from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ClusterRevision::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ClusterRevision::Id, true, chip::NullOptional); } case 2: { LogStep(2, "TH reads the FeatureMap from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::FeatureMap::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::FeatureMap::Id, true, chip::NullOptional); } case 3: { LogStep(3, "TH reads AttributeList from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 4: { LogStep(4, "TH reads optional attribute(VendorName) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 5: { LogStep(5, "TH reads optional attribute(VendorID) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 6: { LogStep(6, "TH reads optional attribute(ProductName) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 7: { LogStep(7, "TH reads optional attribute(NodeLabel) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0005"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 8: { LogStep(8, "TH reads optional attribute(HardwareVersion) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 9: { LogStep(9, "TH reads optional attribute(HardwareVersionString) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0008"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 10: { LogStep(10, "TH reads optional attribute(SoftwareVersion) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0009"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 11: { LogStep(11, "TH reads optional attribute(SoftwareVersionString) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000a"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 12: { LogStep(12, "TH reads optional attribute(ManufacturingDate) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000b"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 13: { LogStep(13, "TH reads optional attribute(PartNumber) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000c"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 14: { LogStep(14, "TH reads optional attribute(ProductURL) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000d"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 15: { LogStep(15, "TH reads optional attribute(ProductLabel) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000e"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 16: { LogStep(16, "TH reads optional attribute(SerialNumber) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000f"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 17: { LogStep(17, "TH reads optional attribute(UniqueID) in AttributeList"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AttributeList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AttributeList::Id, true, chip::NullOptional); } case 18: { LogStep(18, "TH1 reads AcceptedCommandList from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::AcceptedCommandList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::AcceptedCommandList::Id, true, chip::NullOptional); } case 19: { LogStep(19, "TH1 reads GeneratedCommandList from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::GeneratedCommandList::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::GeneratedCommandList::Id, true, chip::NullOptional); } } return CHIP_NO_ERROR; @@ -7274,8 +7274,8 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand case 1: { LogStep(1, "TH reads VendorName from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorName::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorName::Id, true, chip::NullOptional); } case 2: { LogStep(2, "TH writes VendorName from the DUT."); @@ -7283,20 +7283,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("samplegarbage: not in length on purpose", 6); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorName::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorName::Id, value, chip::NullOptional, + chip::NullOptional); } case 3: { LogStep(3, "TH reads VendorName from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorName::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorName::Id, true, chip::NullOptional); } case 4: { LogStep(4, "TH reads VendorID from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorID::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } case 5: { LogStep(5, "Verify that VendorID matches the value assigned to this manufacturer"); @@ -7314,20 +7315,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::VendorId value; value = static_cast(17); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorID::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorID::Id, value, chip::NullOptional, + chip::NullOptional); } case 7: { LogStep(7, "TH reads VendorID from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::VendorID::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } case 8: { LogStep(8, "TH reads ProductName from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductName::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductName::Id, true, chip::NullOptional); } case 9: { LogStep(9, "TH writes ProductName from the DUT."); @@ -7335,20 +7337,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newproductgarbage: not in length on purpose", 10); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductName::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductName::Id, value, chip::NullOptional, + chip::NullOptional); } case 10: { LogStep(10, "TH reads ProductName from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductName::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductName::Id, true, chip::NullOptional); } case 11: { LogStep(11, "TH reads NodeLabel from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0005"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::NodeLabel::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::NodeLabel::Id, true, chip::NullOptional); } case 12: { LogStep(12, "TH writes NodeLabel from the DUT."); @@ -7373,8 +7376,8 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand case 14: { LogStep(14, "TH reads HardwareVersion from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersion::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id, true, chip::NullOptional); } case 15: { LogStep(15, "TH writes HardwareVersion from the DUT."); @@ -7382,21 +7385,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; uint16_t value; value = 17713U; - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersion::Id, value, chip::NullOptional, + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id, value, chip::NullOptional, chip::NullOptional); } case 16: { LogStep(16, "TH reads HardwareVersion from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersion::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersion::Id, true, chip::NullOptional); } case 17: { LogStep(17, "TH reads HardwareVersionString from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0008"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersionString::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id, true, chip::NullOptional); } case 18: { LogStep(18, "TH writes HardwareVersionString from the DUT."); @@ -7404,21 +7407,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newhardwareversiongarbage: not in length on purpose", 18); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersionString::Id, value, chip::NullOptional, + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id, value, chip::NullOptional, chip::NullOptional); } case 19: { LogStep(19, "TH reads HardwareVersionString from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0008"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::HardwareVersionString::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::HardwareVersionString::Id, true, chip::NullOptional); } case 20: { LogStep(20, "TH reads SoftwareVersion from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0009"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersion::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id, true, chip::NullOptional); } case 21: { LogStep(21, "TH writes SoftwareVersion from the DUT."); @@ -7426,21 +7429,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; uint32_t value; value = 33299UL; - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersion::Id, value, chip::NullOptional, + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id, value, chip::NullOptional, chip::NullOptional); } case 22: { LogStep(22, "TH reads SoftwareVersion from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0009"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersion::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersion::Id, true, chip::NullOptional); } case 23: { LogStep(23, "TH reads SoftwareVersionString from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000a"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersionString::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id, true, chip::NullOptional); } case 24: { LogStep(24, "TH writes SoftwareVersionString from the DUT."); @@ -7448,21 +7451,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("1.0garbage: not in length on purpose", 3); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersionString::Id, value, chip::NullOptional, + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id, value, chip::NullOptional, chip::NullOptional); } case 25: { LogStep(25, "TH reads SoftwareVersionString from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000a"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SoftwareVersionString::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SoftwareVersionString::Id, true, chip::NullOptional); } case 26: { LogStep(26, "TH reads ManufacturingDate from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000b"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ManufacturingDate::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id, true, chip::NullOptional); } case 27: { LogStep(27, "Verify if the first 8 characters specify date according to ISO 8601, i.e, YYYYMMDD."); @@ -7480,21 +7483,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("20210814789452INgarbage: not in length on purpose", 16); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ManufacturingDate::Id, value, chip::NullOptional, + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id, value, chip::NullOptional, chip::NullOptional); } case 29: { LogStep(29, "TH reads ManufacturingDate from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000b"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ManufacturingDate::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ManufacturingDate::Id, true, chip::NullOptional); } case 30: { LogStep(30, "TH reads PartNumber from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000c"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::PartNumber::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::PartNumber::Id, true, chip::NullOptional); } case 31: { LogStep(31, "TH writes PartNumber from the DUT."); @@ -7502,20 +7505,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newpartgarbage: not in length on purpose", 7); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::PartNumber::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::PartNumber::Id, value, chip::NullOptional, + chip::NullOptional); } case 32: { LogStep(32, "TH reads PartNumber from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000c"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::PartNumber::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::PartNumber::Id, true, chip::NullOptional); } case 33: { LogStep(33, "TH reads ProductURL from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000d"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductURL::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductURL::Id, true, chip::NullOptional); } case 34: { LogStep(34, @@ -7535,20 +7539,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("https://www.example.comgarbage: not in length on purpose", 23); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductURL::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductURL::Id, value, chip::NullOptional, + chip::NullOptional); } case 36: { LogStep(36, "TH reads ProductURL from the DUT"); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000d"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductURL::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductURL::Id, true, chip::NullOptional); } case 37: { LogStep(37, "TH reads ProductLabel from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000e"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductLabel::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductLabel::Id, true, chip::NullOptional); } case 38: { LogStep(38, "Verify that it does not include the name of the vendor as defined within the VendorName attribute"); @@ -7566,20 +7571,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newproductlabelgarbage: not in length on purpose", 15); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductLabel::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductLabel::Id, value, chip::NullOptional, + chip::NullOptional); } case 40: { LogStep(40, "TH reads ProductLabel from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000e"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::ProductLabel::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::ProductLabel::Id, true, chip::NullOptional); } case 41: { LogStep(41, "TH reads SerialNumber from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000f"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SerialNumber::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SerialNumber::Id, true, chip::NullOptional); } case 42: { LogStep(42, "TH writes SerialNumber from the DUT."); @@ -7587,20 +7593,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newserialnumbergarbage: not in length on purpose", 15); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SerialNumber::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SerialNumber::Id, value, chip::NullOptional, + chip::NullOptional); } case 43: { LogStep(43, "TH reads SerialNumber from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A000f"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::SerialNumber::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::SerialNumber::Id, true, chip::NullOptional); } case 44: { LogStep(44, "TH reads Reachable from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::Reachable::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::Reachable::Id, true, chip::NullOptional); } case 45: { LogStep(45, "TH sends Write request message to DUT to change value of Reachable to false"); @@ -7608,20 +7615,21 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; bool value; value = false; - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::Reachable::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::Reachable::Id, value, chip::NullOptional, + chip::NullOptional); } case 46: { LogStep(46, "TH reads Reachable from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::Reachable::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::Reachable::Id, true, chip::NullOptional); } case 47: { LogStep(47, "TH reads UniqueID from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::UniqueID::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::UniqueID::Id, true, chip::NullOptional); } case 48: { LogStep(48, "TH writes UniqueID from the DUT."); @@ -7629,14 +7637,15 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand ListFreer listFreer; chip::CharSpan value; value = chip::Span("newidgarbage: not in length on purpose", 5); - return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::UniqueID::Id, value, chip::NullOptional, chip::NullOptional); + return WriteAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::UniqueID::Id, value, chip::NullOptional, + chip::NullOptional); } case 49: { LogStep(49, "TH reads UniqueID from the DUT."); VerifyOrDo(!ShouldSkip("BRBINFO.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasic::Id, - BridgedDeviceBasic::Attributes::UniqueID::Id, true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(3), BridgedDeviceBasicInformation::Id, + BridgedDeviceBasicInformation::Attributes::UniqueID::Id, true, chip::NullOptional); } } return CHIP_NO_ERROR; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index a48c4bdcd29c85..e6b57d6f98afe1 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -64,7 +64,7 @@ | WiFiNetworkDiagnostics | 0x0036 | | EthernetNetworkDiagnostics | 0x0037 | | TimeSynchronization | 0x0038 | -| BridgedDeviceBasic | 0x0039 | +| BridgedDeviceBasicInformation | 0x0039 | | Switch | 0x003B | | AdministratorCommissioning | 0x003C | | OperationalCredentials | 0x003E | @@ -30539,7 +30539,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Subsc }; /*----------------------------------------------------------------------------*\ -| Cluster BridgedDeviceBasic | 0x0039 | +| Cluster BridgedDeviceBasicInformation | 0x0039 | |------------------------------------------------------------------------------| | Commands: | | |------------------------------------------------------------------------------| @@ -30575,27 +30575,27 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Subsc /* * Attribute VendorName */ -class ReadBridgedDeviceBasicVendorName : public ReadAttribute { +class ReadBridgedDeviceBasicInformationVendorName : public ReadAttribute { public: - ReadBridgedDeviceBasicVendorName() + ReadBridgedDeviceBasicInformationVendorName() : ReadAttribute("vendor-name") { } - ~ReadBridgedDeviceBasicVendorName() {} + ~ReadBridgedDeviceBasicInformationVendorName() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeVendorNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.VendorName response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic VendorName read Error", error); + LogNSError("BridgedDeviceBasicInformation VendorName read Error", error); } SetCommandExitStatus(error); }]; @@ -30603,22 +30603,22 @@ class ReadBridgedDeviceBasicVendorName : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationVendorName : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicVendorName() + SubscribeAttributeBridgedDeviceBasicInformationVendorName() : SubscribeAttribute("vendor-name") { } - ~SubscribeAttributeBridgedDeviceBasicVendorName() {} + ~SubscribeAttributeBridgedDeviceBasicInformationVendorName() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -30634,7 +30634,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.VendorName response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.VendorName response %@", [value description]); SetCommandExitStatus(error); }]; @@ -30645,27 +30645,27 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute /* * Attribute VendorID */ -class ReadBridgedDeviceBasicVendorID : public ReadAttribute { +class ReadBridgedDeviceBasicInformationVendorID : public ReadAttribute { public: - ReadBridgedDeviceBasicVendorID() + ReadBridgedDeviceBasicInformationVendorID() : ReadAttribute("vendor-id") { } - ~ReadBridgedDeviceBasicVendorID() {} + ~ReadBridgedDeviceBasicInformationVendorID() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeVendorIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.VendorID response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic VendorID read Error", error); + LogNSError("BridgedDeviceBasicInformation VendorID read Error", error); } SetCommandExitStatus(error); }]; @@ -30673,22 +30673,22 @@ class ReadBridgedDeviceBasicVendorID : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationVendorID : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicVendorID() + SubscribeAttributeBridgedDeviceBasicInformationVendorID() : SubscribeAttribute("vendor-id") { } - ~SubscribeAttributeBridgedDeviceBasicVendorID() {} + ~SubscribeAttributeBridgedDeviceBasicInformationVendorID() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -30704,7 +30704,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.VendorID response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.VendorID response %@", [value description]); SetCommandExitStatus(error); }]; @@ -30715,27 +30715,27 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute { /* * Attribute ProductName */ -class ReadBridgedDeviceBasicProductName : public ReadAttribute { +class ReadBridgedDeviceBasicInformationProductName : public ReadAttribute { public: - ReadBridgedDeviceBasicProductName() + ReadBridgedDeviceBasicInformationProductName() : ReadAttribute("product-name") { } - ~ReadBridgedDeviceBasicProductName() {} + ~ReadBridgedDeviceBasicInformationProductName() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeProductNameWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductName response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic ProductName read Error", error); + LogNSError("BridgedDeviceBasicInformation ProductName read Error", error); } SetCommandExitStatus(error); }]; @@ -30743,22 +30743,22 @@ class ReadBridgedDeviceBasicProductName : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationProductName : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicProductName() + SubscribeAttributeBridgedDeviceBasicInformationProductName() : SubscribeAttribute("product-name") { } - ~SubscribeAttributeBridgedDeviceBasicProductName() {} + ~SubscribeAttributeBridgedDeviceBasicInformationProductName() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -30774,7 +30774,7 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribut mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductName response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductName response %@", [value description]); SetCommandExitStatus(error); }]; @@ -30785,27 +30785,27 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribut /* * Attribute NodeLabel */ -class ReadBridgedDeviceBasicNodeLabel : public ReadAttribute { +class ReadBridgedDeviceBasicInformationNodeLabel : public ReadAttribute { public: - ReadBridgedDeviceBasicNodeLabel() + ReadBridgedDeviceBasicInformationNodeLabel() : ReadAttribute("node-label") { } - ~ReadBridgedDeviceBasicNodeLabel() {} + ~ReadBridgedDeviceBasicInformationNodeLabel() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeNodeLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.NodeLabel response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic NodeLabel read Error", error); + LogNSError("BridgedDeviceBasicInformation NodeLabel read Error", error); } SetCommandExitStatus(error); }]; @@ -30813,9 +30813,9 @@ class ReadBridgedDeviceBasicNodeLabel : public ReadAttribute { } }; -class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute { +class WriteBridgedDeviceBasicInformationNodeLabel : public WriteAttribute { public: - WriteBridgedDeviceBasicNodeLabel() + WriteBridgedDeviceBasicInformationNodeLabel() : WriteAttribute("node-label") { AddArgument("attr-name", "node-label"); @@ -30823,15 +30823,15 @@ class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute { WriteAttribute::AddArguments(); } - ~WriteBridgedDeviceBasicNodeLabel() {} + ~WriteBridgedDeviceBasicInformationNodeLabel() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) WriteAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -30844,7 +30844,7 @@ class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute { params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("BridgedDeviceBasic NodeLabel write Error", error); + LogNSError("BridgedDeviceBasicInformation NodeLabel write Error", error); } SetCommandExitStatus(error); }]; @@ -30855,22 +30855,22 @@ class WriteBridgedDeviceBasicNodeLabel : public WriteAttribute { chip::ByteSpan mValue; }; -class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationNodeLabel : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicNodeLabel() + SubscribeAttributeBridgedDeviceBasicInformationNodeLabel() : SubscribeAttribute("node-label") { } - ~SubscribeAttributeBridgedDeviceBasicNodeLabel() {} + ~SubscribeAttributeBridgedDeviceBasicInformationNodeLabel() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -30886,7 +30886,7 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.NodeLabel response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.NodeLabel response %@", [value description]); SetCommandExitStatus(error); }]; @@ -30897,27 +30897,27 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute /* * Attribute HardwareVersion */ -class ReadBridgedDeviceBasicHardwareVersion : public ReadAttribute { +class ReadBridgedDeviceBasicInformationHardwareVersion : public ReadAttribute { public: - ReadBridgedDeviceBasicHardwareVersion() + ReadBridgedDeviceBasicInformationHardwareVersion() : ReadAttribute("hardware-version") { } - ~ReadBridgedDeviceBasicHardwareVersion() {} + ~ReadBridgedDeviceBasicInformationHardwareVersion() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000007) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeHardwareVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.HardwareVersion response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic HardwareVersion read Error", error); + LogNSError("BridgedDeviceBasicInformation HardwareVersion read Error", error); } SetCommandExitStatus(error); }]; @@ -30925,22 +30925,22 @@ class ReadBridgedDeviceBasicHardwareVersion : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationHardwareVersion : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicHardwareVersion() + SubscribeAttributeBridgedDeviceBasicInformationHardwareVersion() : SubscribeAttribute("hardware-version") { } - ~SubscribeAttributeBridgedDeviceBasicHardwareVersion() {} + ~SubscribeAttributeBridgedDeviceBasicInformationHardwareVersion() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000007) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -30956,7 +30956,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttr mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.HardwareVersion response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.HardwareVersion response %@", [value description]); SetCommandExitStatus(error); }]; @@ -30967,27 +30967,27 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttr /* * Attribute HardwareVersionString */ -class ReadBridgedDeviceBasicHardwareVersionString : public ReadAttribute { +class ReadBridgedDeviceBasicInformationHardwareVersionString : public ReadAttribute { public: - ReadBridgedDeviceBasicHardwareVersionString() + ReadBridgedDeviceBasicInformationHardwareVersionString() : ReadAttribute("hardware-version-string") { } - ~ReadBridgedDeviceBasicHardwareVersionString() {} + ~ReadBridgedDeviceBasicInformationHardwareVersionString() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000008) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeHardwareVersionStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.HardwareVersionString response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic HardwareVersionString read Error", error); + LogNSError("BridgedDeviceBasicInformation HardwareVersionString read Error", error); } SetCommandExitStatus(error); }]; @@ -30995,22 +30995,22 @@ class ReadBridgedDeviceBasicHardwareVersionString : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationHardwareVersionString : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicHardwareVersionString() + SubscribeAttributeBridgedDeviceBasicInformationHardwareVersionString() : SubscribeAttribute("hardware-version-string") { } - ~SubscribeAttributeBridgedDeviceBasicHardwareVersionString() {} + ~SubscribeAttributeBridgedDeviceBasicInformationHardwareVersionString() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000008) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31026,7 +31026,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public Subscri mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.HardwareVersionString response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.HardwareVersionString response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31037,27 +31037,27 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public Subscri /* * Attribute SoftwareVersion */ -class ReadBridgedDeviceBasicSoftwareVersion : public ReadAttribute { +class ReadBridgedDeviceBasicInformationSoftwareVersion : public ReadAttribute { public: - ReadBridgedDeviceBasicSoftwareVersion() + ReadBridgedDeviceBasicInformationSoftwareVersion() : ReadAttribute("software-version") { } - ~ReadBridgedDeviceBasicSoftwareVersion() {} + ~ReadBridgedDeviceBasicInformationSoftwareVersion() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000009) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSoftwareVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SoftwareVersion response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic SoftwareVersion read Error", error); + LogNSError("BridgedDeviceBasicInformation SoftwareVersion read Error", error); } SetCommandExitStatus(error); }]; @@ -31065,22 +31065,22 @@ class ReadBridgedDeviceBasicSoftwareVersion : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersion : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicSoftwareVersion() + SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersion() : SubscribeAttribute("software-version") { } - ~SubscribeAttributeBridgedDeviceBasicSoftwareVersion() {} + ~SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersion() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000009) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31096,7 +31096,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttr mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SoftwareVersion response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SoftwareVersion response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31107,27 +31107,27 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttr /* * Attribute SoftwareVersionString */ -class ReadBridgedDeviceBasicSoftwareVersionString : public ReadAttribute { +class ReadBridgedDeviceBasicInformationSoftwareVersionString : public ReadAttribute { public: - ReadBridgedDeviceBasicSoftwareVersionString() + ReadBridgedDeviceBasicInformationSoftwareVersionString() : ReadAttribute("software-version-string") { } - ~ReadBridgedDeviceBasicSoftwareVersionString() {} + ~ReadBridgedDeviceBasicInformationSoftwareVersionString() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000A) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSoftwareVersionStringWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SoftwareVersionString response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic SoftwareVersionString read Error", error); + LogNSError("BridgedDeviceBasicInformation SoftwareVersionString read Error", error); } SetCommandExitStatus(error); }]; @@ -31135,22 +31135,22 @@ class ReadBridgedDeviceBasicSoftwareVersionString : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersionString : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicSoftwareVersionString() + SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersionString() : SubscribeAttribute("software-version-string") { } - ~SubscribeAttributeBridgedDeviceBasicSoftwareVersionString() {} + ~SubscribeAttributeBridgedDeviceBasicInformationSoftwareVersionString() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000A) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31166,7 +31166,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public Subscri mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SoftwareVersionString response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SoftwareVersionString response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31177,27 +31177,27 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public Subscri /* * Attribute ManufacturingDate */ -class ReadBridgedDeviceBasicManufacturingDate : public ReadAttribute { +class ReadBridgedDeviceBasicInformationManufacturingDate : public ReadAttribute { public: - ReadBridgedDeviceBasicManufacturingDate() + ReadBridgedDeviceBasicInformationManufacturingDate() : ReadAttribute("manufacturing-date") { } - ~ReadBridgedDeviceBasicManufacturingDate() {} + ~ReadBridgedDeviceBasicInformationManufacturingDate() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000B) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeManufacturingDateWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ManufacturingDate response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic ManufacturingDate read Error", error); + LogNSError("BridgedDeviceBasicInformation ManufacturingDate read Error", error); } SetCommandExitStatus(error); }]; @@ -31205,22 +31205,22 @@ class ReadBridgedDeviceBasicManufacturingDate : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationManufacturingDate : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicManufacturingDate() + SubscribeAttributeBridgedDeviceBasicInformationManufacturingDate() : SubscribeAttribute("manufacturing-date") { } - ~SubscribeAttributeBridgedDeviceBasicManufacturingDate() {} + ~SubscribeAttributeBridgedDeviceBasicInformationManufacturingDate() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000B) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31236,7 +31236,7 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAt mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ManufacturingDate response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ManufacturingDate response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31247,27 +31247,27 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAt /* * Attribute PartNumber */ -class ReadBridgedDeviceBasicPartNumber : public ReadAttribute { +class ReadBridgedDeviceBasicInformationPartNumber : public ReadAttribute { public: - ReadBridgedDeviceBasicPartNumber() + ReadBridgedDeviceBasicInformationPartNumber() : ReadAttribute("part-number") { } - ~ReadBridgedDeviceBasicPartNumber() {} + ~ReadBridgedDeviceBasicInformationPartNumber() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000C) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributePartNumberWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.PartNumber response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic PartNumber read Error", error); + LogNSError("BridgedDeviceBasicInformation PartNumber read Error", error); } SetCommandExitStatus(error); }]; @@ -31275,22 +31275,22 @@ class ReadBridgedDeviceBasicPartNumber : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationPartNumber : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicPartNumber() + SubscribeAttributeBridgedDeviceBasicInformationPartNumber() : SubscribeAttribute("part-number") { } - ~SubscribeAttributeBridgedDeviceBasicPartNumber() {} + ~SubscribeAttributeBridgedDeviceBasicInformationPartNumber() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000C) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31306,7 +31306,7 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.PartNumber response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.PartNumber response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31317,27 +31317,27 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute /* * Attribute ProductURL */ -class ReadBridgedDeviceBasicProductURL : public ReadAttribute { +class ReadBridgedDeviceBasicInformationProductURL : public ReadAttribute { public: - ReadBridgedDeviceBasicProductURL() + ReadBridgedDeviceBasicInformationProductURL() : ReadAttribute("product-url") { } - ~ReadBridgedDeviceBasicProductURL() {} + ~ReadBridgedDeviceBasicInformationProductURL() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000D) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeProductURLWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductURL response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic ProductURL read Error", error); + LogNSError("BridgedDeviceBasicInformation ProductURL read Error", error); } SetCommandExitStatus(error); }]; @@ -31345,22 +31345,22 @@ class ReadBridgedDeviceBasicProductURL : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationProductURL : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicProductURL() + SubscribeAttributeBridgedDeviceBasicInformationProductURL() : SubscribeAttribute("product-url") { } - ~SubscribeAttributeBridgedDeviceBasicProductURL() {} + ~SubscribeAttributeBridgedDeviceBasicInformationProductURL() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000D) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31376,7 +31376,7 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductURL response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductURL response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31387,27 +31387,27 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute /* * Attribute ProductLabel */ -class ReadBridgedDeviceBasicProductLabel : public ReadAttribute { +class ReadBridgedDeviceBasicInformationProductLabel : public ReadAttribute { public: - ReadBridgedDeviceBasicProductLabel() + ReadBridgedDeviceBasicInformationProductLabel() : ReadAttribute("product-label") { } - ~ReadBridgedDeviceBasicProductLabel() {} + ~ReadBridgedDeviceBasicInformationProductLabel() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeProductLabelWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductLabel response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic ProductLabel read Error", error); + LogNSError("BridgedDeviceBasicInformation ProductLabel read Error", error); } SetCommandExitStatus(error); }]; @@ -31415,22 +31415,22 @@ class ReadBridgedDeviceBasicProductLabel : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationProductLabel : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicProductLabel() + SubscribeAttributeBridgedDeviceBasicInformationProductLabel() : SubscribeAttribute("product-label") { } - ~SubscribeAttributeBridgedDeviceBasicProductLabel() {} + ~SubscribeAttributeBridgedDeviceBasicInformationProductLabel() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31446,7 +31446,7 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribu mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ProductLabel response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ProductLabel response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31457,27 +31457,27 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribu /* * Attribute SerialNumber */ -class ReadBridgedDeviceBasicSerialNumber : public ReadAttribute { +class ReadBridgedDeviceBasicInformationSerialNumber : public ReadAttribute { public: - ReadBridgedDeviceBasicSerialNumber() + ReadBridgedDeviceBasicInformationSerialNumber() : ReadAttribute("serial-number") { } - ~ReadBridgedDeviceBasicSerialNumber() {} + ~ReadBridgedDeviceBasicInformationSerialNumber() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000000F) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSerialNumberWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SerialNumber response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic SerialNumber read Error", error); + LogNSError("BridgedDeviceBasicInformation SerialNumber read Error", error); } SetCommandExitStatus(error); }]; @@ -31485,22 +31485,22 @@ class ReadBridgedDeviceBasicSerialNumber : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationSerialNumber : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicSerialNumber() + SubscribeAttributeBridgedDeviceBasicInformationSerialNumber() : SubscribeAttribute("serial-number") { } - ~SubscribeAttributeBridgedDeviceBasicSerialNumber() {} + ~SubscribeAttributeBridgedDeviceBasicInformationSerialNumber() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000000F) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31516,7 +31516,7 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribu mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.SerialNumber response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.SerialNumber response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31527,27 +31527,27 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribu /* * Attribute Reachable */ -class ReadBridgedDeviceBasicReachable : public ReadAttribute { +class ReadBridgedDeviceBasicInformationReachable : public ReadAttribute { public: - ReadBridgedDeviceBasicReachable() + ReadBridgedDeviceBasicInformationReachable() : ReadAttribute("reachable") { } - ~ReadBridgedDeviceBasicReachable() {} + ~ReadBridgedDeviceBasicInformationReachable() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000011) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeReachableWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.Reachable response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic Reachable read Error", error); + LogNSError("BridgedDeviceBasicInformation Reachable read Error", error); } SetCommandExitStatus(error); }]; @@ -31555,22 +31555,22 @@ class ReadBridgedDeviceBasicReachable : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationReachable : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicReachable() + SubscribeAttributeBridgedDeviceBasicInformationReachable() : SubscribeAttribute("reachable") { } - ~SubscribeAttributeBridgedDeviceBasicReachable() {} + ~SubscribeAttributeBridgedDeviceBasicInformationReachable() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000011) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31586,7 +31586,7 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.Reachable response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.Reachable response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31597,27 +31597,27 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute /* * Attribute UniqueID */ -class ReadBridgedDeviceBasicUniqueID : public ReadAttribute { +class ReadBridgedDeviceBasicInformationUniqueID : public ReadAttribute { public: - ReadBridgedDeviceBasicUniqueID() + ReadBridgedDeviceBasicInformationUniqueID() : ReadAttribute("unique-id") { } - ~ReadBridgedDeviceBasicUniqueID() {} + ~ReadBridgedDeviceBasicInformationUniqueID() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x00000012) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeUniqueIDWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.UniqueID response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic UniqueID read Error", error); + LogNSError("BridgedDeviceBasicInformation UniqueID read Error", error); } SetCommandExitStatus(error); }]; @@ -31625,22 +31625,22 @@ class ReadBridgedDeviceBasicUniqueID : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationUniqueID : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicUniqueID() + SubscribeAttributeBridgedDeviceBasicInformationUniqueID() : SubscribeAttribute("unique-id") { } - ~SubscribeAttributeBridgedDeviceBasicUniqueID() {} + ~SubscribeAttributeBridgedDeviceBasicInformationUniqueID() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x00000012) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31656,7 +31656,7 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.UniqueID response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.UniqueID response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31667,27 +31667,27 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute { /* * Attribute GeneratedCommandList */ -class ReadBridgedDeviceBasicGeneratedCommandList : public ReadAttribute { +class ReadBridgedDeviceBasicInformationGeneratedCommandList : public ReadAttribute { public: - ReadBridgedDeviceBasicGeneratedCommandList() + ReadBridgedDeviceBasicInformationGeneratedCommandList() : ReadAttribute("generated-command-list") { } - ~ReadBridgedDeviceBasicGeneratedCommandList() {} + ~ReadBridgedDeviceBasicInformationGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.GeneratedCommandList response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic GeneratedCommandList read Error", error); + LogNSError("BridgedDeviceBasicInformation GeneratedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -31695,22 +31695,22 @@ class ReadBridgedDeviceBasicGeneratedCommandList : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationGeneratedCommandList : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicGeneratedCommandList() + SubscribeAttributeBridgedDeviceBasicInformationGeneratedCommandList() : SubscribeAttribute("generated-command-list") { } - ~SubscribeAttributeBridgedDeviceBasicGeneratedCommandList() {} + ~SubscribeAttributeBridgedDeviceBasicInformationGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31726,7 +31726,7 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.GeneratedCommandList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.GeneratedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31737,27 +31737,27 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib /* * Attribute AcceptedCommandList */ -class ReadBridgedDeviceBasicAcceptedCommandList : public ReadAttribute { +class ReadBridgedDeviceBasicInformationAcceptedCommandList : public ReadAttribute { public: - ReadBridgedDeviceBasicAcceptedCommandList() + ReadBridgedDeviceBasicInformationAcceptedCommandList() : ReadAttribute("accepted-command-list") { } - ~ReadBridgedDeviceBasicAcceptedCommandList() {} + ~ReadBridgedDeviceBasicInformationAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.AcceptedCommandList response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic AcceptedCommandList read Error", error); + LogNSError("BridgedDeviceBasicInformation AcceptedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -31765,22 +31765,22 @@ class ReadBridgedDeviceBasicAcceptedCommandList : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationAcceptedCommandList : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicAcceptedCommandList() + SubscribeAttributeBridgedDeviceBasicInformationAcceptedCommandList() : SubscribeAttribute("accepted-command-list") { } - ~SubscribeAttributeBridgedDeviceBasicAcceptedCommandList() {} + ~SubscribeAttributeBridgedDeviceBasicInformationAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31796,7 +31796,7 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.AcceptedCommandList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.AcceptedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31807,27 +31807,27 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe /* * Attribute AttributeList */ -class ReadBridgedDeviceBasicAttributeList : public ReadAttribute { +class ReadBridgedDeviceBasicInformationAttributeList : public ReadAttribute { public: - ReadBridgedDeviceBasicAttributeList() + ReadBridgedDeviceBasicInformationAttributeList() : ReadAttribute("attribute-list") { } - ~ReadBridgedDeviceBasicAttributeList() {} + ~ReadBridgedDeviceBasicInformationAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.AttributeList response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic AttributeList read Error", error); + LogNSError("BridgedDeviceBasicInformation AttributeList read Error", error); } SetCommandExitStatus(error); }]; @@ -31835,22 +31835,22 @@ class ReadBridgedDeviceBasicAttributeList : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationAttributeList : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicAttributeList() + SubscribeAttributeBridgedDeviceBasicInformationAttributeList() : SubscribeAttribute("attribute-list") { } - ~SubscribeAttributeBridgedDeviceBasicAttributeList() {} + ~SubscribeAttributeBridgedDeviceBasicInformationAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31866,7 +31866,7 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.AttributeList response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.AttributeList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31877,27 +31877,27 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib /* * Attribute FeatureMap */ -class ReadBridgedDeviceBasicFeatureMap : public ReadAttribute { +class ReadBridgedDeviceBasicInformationFeatureMap : public ReadAttribute { public: - ReadBridgedDeviceBasicFeatureMap() + ReadBridgedDeviceBasicInformationFeatureMap() : ReadAttribute("feature-map") { } - ~ReadBridgedDeviceBasicFeatureMap() {} + ~ReadBridgedDeviceBasicInformationFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.FeatureMap response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic FeatureMap read Error", error); + LogNSError("BridgedDeviceBasicInformation FeatureMap read Error", error); } SetCommandExitStatus(error); }]; @@ -31905,22 +31905,22 @@ class ReadBridgedDeviceBasicFeatureMap : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationFeatureMap : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicFeatureMap() + SubscribeAttributeBridgedDeviceBasicInformationFeatureMap() : SubscribeAttribute("feature-map") { } - ~SubscribeAttributeBridgedDeviceBasicFeatureMap() {} + ~SubscribeAttributeBridgedDeviceBasicInformationFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -31936,7 +31936,7 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.FeatureMap response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.FeatureMap response %@", [value description]); SetCommandExitStatus(error); }]; @@ -31947,27 +31947,27 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute /* * Attribute ClusterRevision */ -class ReadBridgedDeviceBasicClusterRevision : public ReadAttribute { +class ReadBridgedDeviceBasicInformationClusterRevision : public ReadAttribute { public: - ReadBridgedDeviceBasicClusterRevision() + ReadBridgedDeviceBasicInformationClusterRevision() : ReadAttribute("cluster-revision") { } - ~ReadBridgedDeviceBasicClusterRevision() {} + ~ReadBridgedDeviceBasicInformationClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ClusterRevision response %@", [value description]); if (error != nil) { - LogNSError("BridgedDeviceBasic ClusterRevision read Error", error); + LogNSError("BridgedDeviceBasicInformation ClusterRevision read Error", error); } SetCommandExitStatus(error); }]; @@ -31975,22 +31975,22 @@ class ReadBridgedDeviceBasicClusterRevision : public ReadAttribute { } }; -class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttribute { +class SubscribeAttributeBridgedDeviceBasicInformationClusterRevision : public SubscribeAttribute { public: - SubscribeAttributeBridgedDeviceBasicClusterRevision() + SubscribeAttributeBridgedDeviceBasicInformationClusterRevision() : SubscribeAttribute("cluster-revision") { } - ~SubscribeAttributeBridgedDeviceBasicClusterRevision() {} + ~SubscribeAttributeBridgedDeviceBasicInformationClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000039) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -32006,7 +32006,7 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"BridgedDeviceBasic.ClusterRevision response %@", [value description]); + NSLog(@"BridgedDeviceBasicInformation.ClusterRevision response %@", [value description]); SetCommandExitStatus(error); }]; @@ -98659,58 +98659,58 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands) commands.Register(clusterName, clusterCommands); } -void registerClusterBridgedDeviceBasic(Commands & commands) +void registerClusterBridgedDeviceBasicInformation(Commands & commands) { - using namespace chip::app::Clusters::BridgedDeviceBasic; + using namespace chip::app::Clusters::BridgedDeviceBasicInformation; - const char * clusterName = "BridgedDeviceBasic"; + const char * clusterName = "BridgedDeviceBasicInformation"; commands_list clusterCommands = { make_unique(Id), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // make_unique(Id), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); @@ -101044,7 +101044,7 @@ void registerClusters(Commands & commands) registerClusterThreadNetworkDiagnostics(commands); registerClusterWiFiNetworkDiagnostics(commands); registerClusterEthernetNetworkDiagnostics(commands); - registerClusterBridgedDeviceBasic(commands); + registerClusterBridgedDeviceBasicInformation(commands); registerClusterSwitch(commands); registerClusterAdministratorCommissioning(commands); registerClusterOperationalCredentials(commands); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 0bc213e8be346a..2c520211d897e2 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -4609,9 +4609,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { @@ -4636,9 +4636,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { @@ -4663,9 +4663,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4692,9 +4692,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4716,9 +4716,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4740,9 +4740,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4764,9 +4764,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4788,9 +4788,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4812,9 +4812,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4836,9 +4836,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4860,9 +4860,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4884,9 +4884,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4908,9 +4908,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4932,9 +4932,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4956,9 +4956,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -4980,9 +4980,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -5004,9 +5004,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -5028,9 +5028,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { @@ -5055,9 +5055,9 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { MTRBaseDevice * device = GetDevice("alpha"); commissionerNodeId = mCommissionerNodeId.ValueOr(0); - __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasic alloc] initWithDevice:device - endpointID:@(3) - queue:mCallbackQueue]; + __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device + endpointID:@(3) + queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 2d73fce3376b6e..78e6f7b4da13a8 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -244,11 +244,11 @@ typedef void (*EthernetNetworkDiagnosticsAcceptedCommandListListAttributeCallbac void * context, const chip::app::DataModel::DecodableList & data); typedef void (*EthernetNetworkDiagnosticsAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicGeneratedCommandListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicAcceptedCommandListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*BridgedDeviceBasicAttributeListListAttributeCallback)( +typedef void (*BridgedDeviceBasicInformationAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*SwitchGeneratedCommandListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h index 3929eb6c02a50c..bce0b37f930e41 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h @@ -282,13 +282,14 @@ class DLL_EXPORT EthernetNetworkDiagnosticsCluster : public ClusterBase ~EthernetNetworkDiagnosticsCluster() {} }; -class DLL_EXPORT BridgedDeviceBasicCluster : public ClusterBase +class DLL_EXPORT BridgedDeviceBasicInformationCluster : public ClusterBase { public: - BridgedDeviceBasicCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BridgedDeviceBasic::Id, endpoint) + BridgedDeviceBasicInformationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, + EndpointId endpoint) : + ClusterBase(exchangeManager, session, app::Clusters::BridgedDeviceBasicInformation::Id, endpoint) {} - ~BridgedDeviceBasicCluster() {} + ~BridgedDeviceBasicInformationCluster() {} }; class DLL_EXPORT SwitchCluster : public ClusterBase diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 386b71a2725feb..0cd46e9f520462 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -377,7 +377,7 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 1, Cluster: Bridged Device Basic (client) */ \ + /* Endpoint: 1, Cluster: Bridged Device Basic Information (client) */ \ .clusterId = 0x00000039, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h index 439f069fe5a6c3..b660cfc04b17a8 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h @@ -56,7 +56,7 @@ #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_SWITCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -206,9 +206,9 @@ #define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_CLIENT -// Use this macro to check if the client side of the Bridged Device Basic cluster is included -#define ZCL_USING_BRIDGED_DEVICE_BASIC_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_BRIDGED_DEVICE_BASIC_CLIENT +// Use this macro to check if the client side of the Bridged Device Basic Information cluster is included +#define ZCL_USING_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_CLIENT +#define EMBER_AF_PLUGIN_BRIDGED_DEVICE_BASIC_INFORMATION_CLIENT // Use this macro to check if the client side of the Switch cluster is included #define ZCL_USING_SWITCH_CLUSTER_CLIENT