Skip to content

Commit 49db83b

Browse files
mkardous-silabsmkardous-silabs
committed
fix type and id
1 parent b5c4552 commit 49db83b

File tree

32 files changed

+6976
-4729
lines changed

32 files changed

+6976
-4729
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2463,7 +2463,7 @@ server cluster IcdManagement = 70 {
24632463
kLongIdleTimeSupport = 0x4;
24642464
}
24652465

2466-
bitmap UserActiveModeTriggerBitmanp : bitmap32 {
2466+
bitmap UserActiveModeTriggerBitmap : bitmap32 {
24672467
kPowerCycle = 0x1;
24682468
kSettingsMenu = 0x2;
24692469
kCustomInstruction = 0x4;

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,7 @@ server cluster IcdManagement = 70 {
19561956
kLongIdleTimeSupport = 0x4;
19571957
}
19581958

1959-
bitmap UserActiveModeTriggerBitmanp : bitmap32 {
1959+
bitmap UserActiveModeTriggerBitmap : bitmap32 {
19601960
kPowerCycle = 0x1;
19611961
kSettingsMenu = 0x2;
19621962
kCustomInstruction = 0x4;

‎examples/lock-app/lock-common/lock-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ server cluster IcdManagement = 70 {
16871687
kLongIdleTimeSupport = 0x4;
16881688
}
16891689

1690-
bitmap UserActiveModeTriggerBitmanp : bitmap32 {
1690+
bitmap UserActiveModeTriggerBitmap : bitmap32 {
16911691
kPowerCycle = 0x1;
16921692
kSettingsMenu = 0x2;
16931693
kCustomInstruction = 0x4;

‎examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ server cluster IcdManagement = 70 {
15691569
kLongIdleTimeSupport = 0x4;
15701570
}
15711571

1572-
bitmap UserActiveModeTriggerBitmanp : bitmap32 {
1572+
bitmap UserActiveModeTriggerBitmap : bitmap32 {
15731573
kPowerCycle = 0x1;
15741574
kSettingsMenu = 0x2;
15751575
kCustomInstruction = 0x4;

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
3232
{
3333
public:
3434
OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
35-
EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
35+
EndpointId endpoint) :
36+
ClusterBase(exchangeManager, session, endpoint)
3637
{}
3738
~OtaSoftwareUpdateProviderCluster() {}
3839
};

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
3232
{
3333
public:
3434
OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
35-
EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
35+
EndpointId endpoint) :
36+
ClusterBase(exchangeManager, session, endpoint)
3637
{}
3738
~OtaSoftwareUpdateProviderCluster() {}
3839
};

‎src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<field name="LongIdleTimeSupport" mask="0x4"/>
2626
</bitmap>
2727

28-
<bitmap name="UserActiveModeTriggerBitmanp" type="bitmap32">
28+
<bitmap name="UserActiveModeTriggerBitmap" type="bitmap32">
2929
<cluster code="0x0046"/>
3030
<field name="PowerCycle" mask="0x1"/>
3131
<field name="SettingsMenu" mask="0x2"/>
@@ -77,8 +77,8 @@ limitations under the License.
7777
<access op="read" privilege="administer"/>
7878
</attribute>
7979
<attribute side="server" code="0x05" define="CLIENTS_SUPPORTED_PER_FABRIC" type="int16u" min="1" default="1" writable="false" optional="true" isNullable="false">ClientsSupportedPerFabric</attribute>
80-
<attribute side="server" code="0x06" define="USER_ACTIVE_MODE_TRIGGER_HINT" type="UserActiveModeTriggerBitmanp" writable="false" optional="true" isNullable="false">UserActiveModeTriggerHint</attribute>
81-
<attribute side="server" code="0x06" define="USER_ACTIVE_MODE_TRIGGER_INSTRUCTION" type="string" length="128" writable="false" optional="true" isNullable="false">UserActiveModeTriggerInstruction</attribute>
80+
<attribute side="server" code="0x06" define="USER_ACTIVE_MODE_TRIGGER_HINT" type="UserActiveModeTriggerBitmap" writable="false" optional="true" isNullable="false">UserActiveModeTriggerHint</attribute>
81+
<attribute side="server" code="0x07" define="USER_ACTIVE_MODE_TRIGGER_INSTRUCTION" type="char_string" length="128" writable="false" optional="true" isNullable="false">UserActiveModeTriggerInstruction</attribute>
8282

8383
<command source="client" code="0x00" name="RegisterClient" response="RegisterClientResponse" isFabricScoped="true" optional="true">
8484
<description> Register a client to the end device </description>

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@
202202
"ActiveModeThreshold",
203203
"RegisteredClients",
204204
"ICDCounter",
205-
"ClientsSupportedPerFabric"
205+
"ClientsSupportedPerFabric",
206+
"UserActiveModeTriggerHint",
207+
"UserActiveModeTriggerInstruction"
206208
],
207209
"Operational Credentials": [
208210
"SupportedFabrics",

‎src/app/zap-templates/zcl/zcl.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@
200200
"ActiveModeThreshold",
201201
"RegisteredClients",
202202
"ICDCounter",
203-
"ClientsSupportedPerFabric"
203+
"ClientsSupportedPerFabric",
204+
"UserActiveModeTriggerHint",
205+
"UserActiveModeTriggerInstruction"
204206
],
205207
"Operational Credentials": [
206208
"SupportedFabrics",

‎src/controller/data_model/controller-clusters.matter

+22
Original file line numberDiff line numberDiff line change
@@ -2727,6 +2727,26 @@ client cluster IcdManagement = 70 {
27272727
kLongIdleTimeSupport = 0x4;
27282728
}
27292729

2730+
bitmap UserActiveModeTriggerBitmap : bitmap32 {
2731+
kPowerCycle = 0x1;
2732+
kSettingsMenu = 0x2;
2733+
kCustomInstruction = 0x4;
2734+
kDeviceManual = 0x8;
2735+
kActuateSensor = 0x10;
2736+
kActuateSensorSeconds = 0x20;
2737+
kActuateSensorTimes = 0x40;
2738+
kActuateSensorLightsBlink = 0x80;
2739+
kResetButton = 0x100;
2740+
kResetButtonLightsBlink = 0x200;
2741+
kResetButtonSeconds = 0x400;
2742+
kResetButtonTimes = 0x800;
2743+
kSetupButton = 0x1000;
2744+
kSetupButtonSeconds = 0x2000;
2745+
kSetupButtonLightsBlink = 0x4000;
2746+
kSetupButtonTimes = 0x8000;
2747+
kAppDefinedButton = 0x10000;
2748+
}
2749+
27302750
fabric_scoped struct MonitoringRegistrationStruct {
27312751
fabric_sensitive node_id checkInNodeID = 1;
27322752
fabric_sensitive int64u monitoredSubject = 2;
@@ -2739,6 +2759,8 @@ client cluster IcdManagement = 70 {
27392759
readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
27402760
readonly attribute access(read: administer) optional int32u ICDCounter = 4;
27412761
readonly attribute optional int16u clientsSupportedPerFabric = 5;
2762+
readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
2763+
readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
27422764
readonly attribute command_id generatedCommandList[] = 65528;
27432765
readonly attribute command_id acceptedCommandList[] = 65529;
27442766
readonly attribute event_id eventList[] = 65530;

‎src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+28
Original file line numberDiff line numberDiff line change
@@ -10938,6 +10938,26 @@ public void subscribeClientsSupportedPerFabricAttribute(
1093810938
subscribeClientsSupportedPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
1093910939
}
1094010940

10941+
public void readUserActiveModeTriggerHintAttribute(
10942+
LongAttributeCallback callback) {
10943+
readUserActiveModeTriggerHintAttribute(chipClusterPtr, callback);
10944+
}
10945+
10946+
public void subscribeUserActiveModeTriggerHintAttribute(
10947+
LongAttributeCallback callback, int minInterval, int maxInterval) {
10948+
subscribeUserActiveModeTriggerHintAttribute(chipClusterPtr, callback, minInterval, maxInterval);
10949+
}
10950+
10951+
public void readUserActiveModeTriggerInstructionAttribute(
10952+
CharStringAttributeCallback callback) {
10953+
readUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback);
10954+
}
10955+
10956+
public void subscribeUserActiveModeTriggerInstructionAttribute(
10957+
CharStringAttributeCallback callback, int minInterval, int maxInterval) {
10958+
subscribeUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
10959+
}
10960+
1094110961
public void readGeneratedCommandListAttribute(
1094210962
GeneratedCommandListAttributeCallback callback) {
1094310963
readGeneratedCommandListAttribute(chipClusterPtr, callback);
@@ -11022,6 +11042,14 @@ public void subscribeClusterRevisionAttribute(
1102211042

1102311043
private native void subscribeClientsSupportedPerFabricAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
1102411044

11045+
private native void readUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback);
11046+
11047+
private native void subscribeUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
11048+
11049+
private native void readUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
11050+
11051+
private native void subscribeUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
11052+
1102511053
private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
1102611054

1102711055
private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);

‎src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

+2
Original file line numberDiff line numberDiff line change
@@ -5968,6 +5968,8 @@ public enum Attribute {
59685968
RegisteredClients(3L),
59695969
ICDCounter(4L),
59705970
ClientsSupportedPerFabric(5L),
5971+
UserActiveModeTriggerHint(6L),
5972+
UserActiveModeTriggerInstruction(7L),
59715973
GeneratedCommandList(65528L),
59725974
AcceptedCommandList(65529L),
59735975
EventList(65530L),

‎src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java

+22
Original file line numberDiff line numberDiff line change
@@ -5917,6 +5917,28 @@ private static Map<String, InteractionInfo> readIcdManagementInteractionInfo() {
59175917
readIcdManagementClientsSupportedPerFabricCommandParams
59185918
);
59195919
result.put("readClientsSupportedPerFabricAttribute", readIcdManagementClientsSupportedPerFabricAttributeInteractionInfo);
5920+
Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerHintCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
5921+
InteractionInfo readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo = new InteractionInfo(
5922+
(cluster, callback, commandArguments) -> {
5923+
((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerHintAttribute(
5924+
(ChipClusters.LongAttributeCallback) callback
5925+
);
5926+
},
5927+
() -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
5928+
readIcdManagementUserActiveModeTriggerHintCommandParams
5929+
);
5930+
result.put("readUserActiveModeTriggerHintAttribute", readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo);
5931+
Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerInstructionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
5932+
InteractionInfo readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo = new InteractionInfo(
5933+
(cluster, callback, commandArguments) -> {
5934+
((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerInstructionAttribute(
5935+
(ChipClusters.CharStringAttributeCallback) callback
5936+
);
5937+
},
5938+
() -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
5939+
readIcdManagementUserActiveModeTriggerInstructionCommandParams
5940+
);
5941+
result.put("readUserActiveModeTriggerInstructionAttribute", readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo);
59205942
Map<String, CommandParameterInfo> readIcdManagementGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
59215943
InteractionInfo readIcdManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
59225944
(cluster, callback, commandArguments) -> {

‎src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

+28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)