Make `Power source configuration cluster` match the spec (minor type change) (#30062)
* Type of sources should be endpoint_no instead of raw int8u
* Zap regen
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 817358f..51fd329 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1077,7 +1077,7 @@
/** This cluster is used to describe the configuration and capabilities of a Device's power system. */
server cluster PowerSourceConfiguration = 46 {
- readonly attribute int8u sources[] = 0;
+ readonly attribute endpoint_no sources[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
index 347762b..994cdb7 100644
--- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
@@ -26,6 +26,6 @@
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<globalAttribute side="either" code="0xFFFD" value="1"/>
- <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="int8u" length="6" writable="false" optional="false">Sources</attribute>
+ <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="endpoint_no" length="6" writable="false" optional="false">Sources</attribute>
</cluster>
</configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index ac1a41f..fc1d1b2 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1157,7 +1157,7 @@
/** This cluster is used to describe the configuration and capabilities of a Device's power system. */
client cluster PowerSourceConfiguration = 46 {
- readonly attribute int8u sources[] = 0;
+ readonly attribute endpoint_no sources[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/src/controller/java/zap-generated/CHIPClientCallbacks.h b/src/controller/java/zap-generated/CHIPClientCallbacks.h
index 76f2153..30c2b58 100644
--- a/src/controller/java/zap-generated/CHIPClientCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPClientCallbacks.h
@@ -210,8 +210,8 @@
const chip::app::DataModel::DecodableList<chip::EventId> & data);
typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
- const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(
+ void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 23ceb0d..f71fce0 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -7193,8 +7193,8 @@
env->DeleteGlobalRef(javaCallbackRef);
}
-void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * context,
- const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(
+ void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 5ce56aa..0d2a197 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -1830,7 +1830,7 @@
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
NSNumber * newElement_0;
- newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+ newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
[array_0 addObject:newElement_0];
}
CHIP_ERROR err = iter_0.GetStatus();
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 e0ded3f..53ad0bc 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
@@ -6128,9 +6128,9 @@
namespace Sources {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const uint8_t>;
- using DecodableType = chip::app::DataModel::DecodableList<uint8_t>;
- using DecodableArgType = const chip::app::DataModel::DecodableList<uint8_t> &;
+ using Type = chip::app::DataModel::List<const chip::EndpointId>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::EndpointId>;
+ using DecodableArgType = const chip::app::DataModel::DecodableList<chip::EndpointId> &;
static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::Sources::Id; }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 8b0b717..0dfa96f 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -12870,7 +12870,7 @@
make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), //
make_unique<WriteAttribute<>>(Id, credsIssuerConfig), //
- make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const uint8_t>>>(
+ make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
Id, "sources", Attributes::Sources::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
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 037fd3a..820f568 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -6174,7 +6174,7 @@
switch (path.mAttributeId)
{
case PowerSourceConfiguration::Attributes::Sources::Id: {
- chip::app::DataModel::DecodableList<uint8_t> value;
+ chip::app::DataModel::DecodableList<chip::EndpointId> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("Sources", 1, value);
}
