Skip to content

Commit c057fb3

Browse files
ThirsrinThirsrin
committed
removed doorlock xml changes
1 parent 4c271a2 commit c057fb3

File tree

13 files changed

+21
-31
lines changed

13 files changed

+21
-31
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2972,7 +2972,7 @@ cluster DoorLock = 257 {
29722972
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
29732973
attribute access(write: manage) optional char_string<3> language = 33;
29742974
attribute access(write: manage) optional int8u LEDSettings = 34;
2975-
attribute access(write: manage) optional int32u autoRelockTime = 35;
2975+
attribute access(write: manage) int32u autoRelockTime = 35;
29762976
attribute access(write: manage) optional int8u soundVolume = 36;
29772977
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
29782978
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ cluster DoorLock = 257 {
18781878
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
18791879
attribute access(write: manage) optional char_string<3> language = 33;
18801880
attribute access(write: manage) optional int8u LEDSettings = 34;
1881-
attribute access(write: manage) optional int32u autoRelockTime = 35;
1881+
attribute access(write: manage) int32u autoRelockTime = 35;
18821882
attribute access(write: manage) optional int8u soundVolume = 36;
18831883
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
18841884
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/lighting-app/tizen/src/DBusInterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void DBusInterface::InitColor()
218218
auto status = Clusters::ColorControl::Attributes::ColorMode::Get(mEndpointId, &value);
219219
VerifyOrReturn(status == Protocols::InteractionModel::Status::Success,
220220
ChipLogError(NotSpecified, "Error getting ColorMode: 0x%x", to_underlying(status)));
221-
light_app_color_control_set_color_mode(mIfaceColorControl, value);
221+
light_app_color_control_set_color_mode(mIfaceColorControl, static_cast<guchar>(value));
222222
}
223223
{
224224
uint16_t value = 0;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,7 @@ cluster DoorLock = 257 {
22522252
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
22532253
attribute access(write: manage) optional char_string<3> language = 33;
22542254
attribute access(write: manage) optional int8u LEDSettings = 34;
2255-
attribute access(write: manage) optional int32u autoRelockTime = 35;
2255+
attribute access(write: manage) int32u autoRelockTime = 35;
22562256
attribute access(write: manage) optional int8u soundVolume = 36;
22572257
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
22582258
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/lock-app/nxp/zap/lock-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ cluster DoorLock = 257 {
15041504
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
15051505
attribute access(write: manage) optional char_string<3> language = 33;
15061506
attribute access(write: manage) optional int8u LEDSettings = 34;
1507-
attribute access(write: manage) optional int32u autoRelockTime = 35;
1507+
attribute access(write: manage) int32u autoRelockTime = 35;
15081508
attribute access(write: manage) optional int8u soundVolume = 36;
15091509
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
15101510
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/lock-app/qpg/zap/lock.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1908,7 +1908,7 @@ cluster DoorLock = 257 {
19081908
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
19091909
attribute access(write: manage) optional char_string<3> language = 33;
19101910
attribute access(write: manage) optional int8u LEDSettings = 34;
1911-
attribute access(write: manage) optional int32u autoRelockTime = 35;
1911+
attribute access(write: manage) int32u autoRelockTime = 35;
19121912
attribute access(write: manage) optional int8u soundVolume = 36;
19131913
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
19141914
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/placeholder/linux/apps/app1/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -3566,7 +3566,7 @@ cluster DoorLock = 257 {
35663566
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
35673567
attribute access(write: manage) optional char_string<3> language = 33;
35683568
attribute access(write: manage) optional int8u LEDSettings = 34;
3569-
attribute access(write: manage) optional int32u autoRelockTime = 35;
3569+
attribute access(write: manage) int32u autoRelockTime = 35;
35703570
attribute access(write: manage) optional int8u soundVolume = 36;
35713571
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
35723572
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
@@ -4217,7 +4217,7 @@ cluster DoorLock = 257 {
42174217
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
42184218
attribute access(write: manage) optional char_string<3> language = 33;
42194219
attribute access(write: manage) optional int8u LEDSettings = 34;
4220-
attribute access(write: manage) optional int32u autoRelockTime = 35;
4220+
attribute access(write: manage) int32u autoRelockTime = 35;
42214221
attribute access(write: manage) optional int8u soundVolume = 36;
42224222
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
42234223
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/placeholder/linux/apps/app2/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -3523,7 +3523,7 @@ cluster DoorLock = 257 {
35233523
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
35243524
attribute access(write: manage) optional char_string<3> language = 33;
35253525
attribute access(write: manage) optional int8u LEDSettings = 34;
3526-
attribute access(write: manage) optional int32u autoRelockTime = 35;
3526+
attribute access(write: manage) int32u autoRelockTime = 35;
35273527
attribute access(write: manage) optional int8u soundVolume = 36;
35283528
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
35293529
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
@@ -4174,7 +4174,7 @@ cluster DoorLock = 257 {
41744174
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
41754175
attribute access(write: manage) optional char_string<3> language = 33;
41764176
attribute access(write: manage) optional int8u LEDSettings = 34;
4177-
attribute access(write: manage) optional int32u autoRelockTime = 35;
4177+
attribute access(write: manage) int32u autoRelockTime = 35;
41784178
attribute access(write: manage) optional int8u soundVolume = 36;
41794179
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
41804180
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/virtual-device-app/virtual-device-common/virtual-device-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,7 @@ cluster DoorLock = 257 {
24482448
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
24492449
attribute access(write: manage) optional char_string<3> language = 33;
24502450
attribute access(write: manage) optional int8u LEDSettings = 34;
2451-
attribute access(write: manage) optional int32u autoRelockTime = 35;
2451+
attribute access(write: manage) int32u autoRelockTime = 35;
24522452
attribute access(write: manage) optional int8u soundVolume = 36;
24532453
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
24542454
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ limitations under the License.
190190
<access op="read" role="view" />
191191
<access op="write" role="manage" />
192192
</attribute>
193-
<attribute side="server" code="35" define="AUTO_RELOCK_TIME" type="int32u" reportable="true" writable="true" optional="true">
193+
<attribute side="server" code="35" define="AUTO_RELOCK_TIME" type="int32u" reportable="true" writable="true">
194194
<description>AutoRelockTime</description>
195195
<access op="read" role="view" />
196196
<access op="write" role="manage" />

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5547,7 +5547,7 @@ cluster DoorLock = 257 {
55475547
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
55485548
attribute access(write: manage) optional char_string<3> language = 33;
55495549
attribute access(write: manage) optional int8u LEDSettings = 34;
5550-
attribute access(write: manage) optional int32u autoRelockTime = 35;
5550+
attribute access(write: manage) int32u autoRelockTime = 35;
55515551
attribute access(write: manage) optional int8u soundVolume = 36;
55525552
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
55535553
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt

+4-14
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp
36473647
}
36483648
}
36493649

3650-
suspend fun readAutoRelockTimeAttribute(): UInt? {
3650+
suspend fun readAutoRelockTimeAttribute(): UInt {
36513651
val ATTRIBUTE_ID: UInt = 35u
36523652

36533653
val attributePath =
@@ -3673,12 +3673,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp
36733673

36743674
// Decode the TLV data into the appropriate type
36753675
val tlvReader = TlvReader(attributeData.data)
3676-
val decodedValue: UInt? =
3677-
if (tlvReader.isNextTag(AnonymousTag)) {
3678-
tlvReader.getUInt(AnonymousTag)
3679-
} else {
3680-
null
3681-
}
3676+
val decodedValue: UInt = tlvReader.getUInt(AnonymousTag)
36823677

36833678
return decodedValue
36843679
}
@@ -3764,14 +3759,9 @@ class DoorLockCluster(private val controller: MatterController, private val endp
37643759

37653760
// Decode the TLV data into the appropriate type
37663761
val tlvReader = TlvReader(attributeData.data)
3767-
val decodedValue: UInt? =
3768-
if (tlvReader.isNextTag(AnonymousTag)) {
3769-
tlvReader.getUInt(AnonymousTag)
3770-
} else {
3771-
null
3772-
}
3762+
val decodedValue: UInt = tlvReader.getUInt(AnonymousTag)
37733763

3774-
decodedValue?.let { emit(UIntSubscriptionState.Success(it)) }
3764+
emit(UIntSubscriptionState.Success(decodedValue))
37753765
}
37763766
SubscriptionState.SubscriptionEstablished -> {
37773767
emit(UIntSubscriptionState.SubscriptionEstablished)

‎src/controller/python/chip/clusters/Objects.py

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

0 commit comments

Comments
 (0)