Skip to content

Commit

Permalink
fix type and id
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkardous-silabs
mkardous-silabs committed Oct 27, 2023
1 parent b5c4552 commit 49db83b
Show file tree
Hide file tree
Showing 32 changed files with 6,976 additions and 4,729 deletions.
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2463,7 +2463,7 @@ server cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmanp : bitmap32 {
bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1956,7 +1956,7 @@ server cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmanp : bitmap32 {
bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ server cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmanp : bitmap32 {
bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
Expand Down
2 changes: 1 addition & 1 deletion examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ server cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmanp : bitmap32 {
bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
Expand Down
3 changes: 2 additions & 1 deletion scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
{
public:
OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
EndpointId endpoint) :
ClusterBase(exchangeManager, session, endpoint)
{}
~OtaSoftwareUpdateProviderCluster() {}
};
Expand Down
3 changes: 2 additions & 1 deletion scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
{
public:
OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
EndpointId endpoint) :
ClusterBase(exchangeManager, session, endpoint)
{}
~OtaSoftwareUpdateProviderCluster() {}
};
Expand Down
6 changes: 3 additions & 3 deletions src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<field name="LongIdleTimeSupport" mask="0x4"/>
</bitmap>

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

<command source="client" code="0x00" name="RegisterClient" response="RegisterClientResponse" isFabricScoped="true" optional="true">
<description> Register a client to the end device </description>
Expand Down
4 changes: 3 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@
"ActiveModeThreshold",
"RegisteredClients",
"ICDCounter",
"ClientsSupportedPerFabric"
"ClientsSupportedPerFabric",
"UserActiveModeTriggerHint",
"UserActiveModeTriggerInstruction"
],
"Operational Credentials": [
"SupportedFabrics",
Expand Down
4 changes: 3 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@
"ActiveModeThreshold",
"RegisteredClients",
"ICDCounter",
"ClientsSupportedPerFabric"
"ClientsSupportedPerFabric",
"UserActiveModeTriggerHint",
"UserActiveModeTriggerInstruction"
],
"Operational Credentials": [
"SupportedFabrics",
Expand Down
22 changes: 22 additions & 0 deletions src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2727,6 +2727,26 @@ client cluster IcdManagement = 70 {
kLongIdleTimeSupport = 0x4;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
kPowerCycle = 0x1;
kSettingsMenu = 0x2;
kCustomInstruction = 0x4;
kDeviceManual = 0x8;
kActuateSensor = 0x10;
kActuateSensorSeconds = 0x20;
kActuateSensorTimes = 0x40;
kActuateSensorLightsBlink = 0x80;
kResetButton = 0x100;
kResetButtonLightsBlink = 0x200;
kResetButtonSeconds = 0x400;
kResetButtonTimes = 0x800;
kSetupButton = 0x1000;
kSetupButtonSeconds = 0x2000;
kSetupButtonLightsBlink = 0x4000;
kSetupButtonTimes = 0x8000;
kAppDefinedButton = 0x10000;
}

fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
Expand All @@ -2739,6 +2759,8 @@ client cluster IcdManagement = 70 {
readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
readonly attribute access(read: administer) optional int32u ICDCounter = 4;
readonly attribute optional int16u clientsSupportedPerFabric = 5;
readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
28 changes: 28 additions & 0 deletions src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10938,6 +10938,26 @@ public void subscribeClientsSupportedPerFabricAttribute(
subscribeClientsSupportedPerFabricAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}

public void readUserActiveModeTriggerHintAttribute(
LongAttributeCallback callback) {
readUserActiveModeTriggerHintAttribute(chipClusterPtr, callback);
}

public void subscribeUserActiveModeTriggerHintAttribute(
LongAttributeCallback callback, int minInterval, int maxInterval) {
subscribeUserActiveModeTriggerHintAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}

public void readUserActiveModeTriggerInstructionAttribute(
CharStringAttributeCallback callback) {
readUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback);
}

public void subscribeUserActiveModeTriggerInstructionAttribute(
CharStringAttributeCallback callback, int minInterval, int maxInterval) {
subscribeUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}

public void readGeneratedCommandListAttribute(
GeneratedCommandListAttributeCallback callback) {
readGeneratedCommandListAttribute(chipClusterPtr, callback);
Expand Down Expand Up @@ -11022,6 +11042,14 @@ public void subscribeClusterRevisionAttribute(

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

private native void readUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback);

private native void subscribeUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);

private native void readUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);

private native void subscribeUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);

private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);

private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
Expand Down
2 changes: 2 additions & 0 deletions src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5968,6 +5968,8 @@ public enum Attribute {
RegisteredClients(3L),
ICDCounter(4L),
ClientsSupportedPerFabric(5L),
UserActiveModeTriggerHint(6L),
UserActiveModeTriggerInstruction(7L),
GeneratedCommandList(65528L),
AcceptedCommandList(65529L),
EventList(65530L),
Expand Down
22 changes: 22 additions & 0 deletions src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5917,6 +5917,28 @@ private static Map<String, InteractionInfo> readIcdManagementInteractionInfo() {
readIcdManagementClientsSupportedPerFabricCommandParams
);
result.put("readClientsSupportedPerFabricAttribute", readIcdManagementClientsSupportedPerFabricAttributeInteractionInfo);
Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerHintCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
InteractionInfo readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerHintAttribute(
(ChipClusters.LongAttributeCallback) callback
);
},
() -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
readIcdManagementUserActiveModeTriggerHintCommandParams
);
result.put("readUserActiveModeTriggerHintAttribute", readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo);
Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerInstructionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
InteractionInfo readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerInstructionAttribute(
(ChipClusters.CharStringAttributeCallback) callback
);
},
() -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
readIcdManagementUserActiveModeTriggerInstructionCommandParams
);
result.put("readUserActiveModeTriggerInstructionAttribute", readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo);
Map<String, CommandParameterInfo> readIcdManagementGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
InteractionInfo readIcdManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
Expand Down
28 changes: 28 additions & 0 deletions src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 49db83b

Please sign in to comment.