Skip to content

Commit 3552388

Browse files
hubTabpull[bot]
hubTab
authored and
pull[bot]
committed
Updated the door-lock-cluster.xml door-lock-cluster.xml to use the specifications type definitions, instead of using the enum* directly (#15528). (#15600)
Fixed the ManualOperationEventMask comment. Rebuilt all-clusters-app, chip-tool, and re-generated zzz files. Note: In the review process, it has been noted that the GetLogRecordResponse command documents the EventType as an enum8. However the spec does not define the EventTypeEnum, which could be easily added to the spec as the Event Type is a textual description.
1 parent bfb9b40 commit 3552388

File tree

20 files changed

+333
-201
lines changed

20 files changed

+333
-201
lines changed

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,12 @@ server cluster DoorLock = 257 {
963963
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
964964
}
965965

966+
bitmap DlCredentialRuleMask : BITMAP8 {
967+
kSingle = 0x1;
968+
kDual = 0x2;
969+
kTri = 0x4;
970+
}
971+
966972
bitmap DlCredentialRulesSupport : BITMAP8 {
967973
kSingle = 0x1;
968974
kDual = 0x2;
@@ -1154,13 +1160,13 @@ server cluster DoorLock = 257 {
11541160
readonly attribute int8u minPINCodeLength = 24;
11551161
readonly attribute int8u maxRFIDCodeLength = 25;
11561162
readonly attribute int8u minRFIDCodeLength = 26;
1157-
readonly attribute bitmap8 credentialRulesSupport = 27;
1163+
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
11581164
attribute char_string<3> language = 33;
11591165
attribute int32u autoRelockTime = 35;
11601166
attribute int8u soundVolume = 36;
11611167
attribute DlOperatingMode operatingMode = 37;
1162-
readonly attribute bitmap16 supportedOperatingModes = 38;
1163-
readonly attribute bitmap16 defaultConfigurationRegister = 39;
1168+
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
1169+
readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
11641170
attribute boolean enableOneTouchLocking = 41;
11651171
attribute boolean enableInsideStatusLED = 42;
11661172
attribute boolean enablePrivacyModeButton = 43;

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,12 @@ server cluster DoorLock = 257 {
382382
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
383383
}
384384

385+
bitmap DlCredentialRuleMask : BITMAP8 {
386+
kSingle = 0x1;
387+
kDual = 0x2;
388+
kTri = 0x4;
389+
}
390+
385391
bitmap DlCredentialRulesSupport : BITMAP8 {
386392
kSingle = 0x1;
387393
kDual = 0x2;
@@ -569,12 +575,12 @@ server cluster DoorLock = 257 {
569575
readonly attribute int8u minPINCodeLength = 24;
570576
readonly attribute int8u maxRFIDCodeLength = 25;
571577
readonly attribute int8u minRFIDCodeLength = 26;
572-
readonly attribute bitmap8 credentialRulesSupport = 27;
578+
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
573579
attribute char_string<3> language = 33;
574580
attribute int32u autoRelockTime = 35;
575581
attribute int8u soundVolume = 36;
576582
attribute DlOperatingMode operatingMode = 37;
577-
readonly attribute bitmap16 supportedOperatingModes = 38;
583+
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
578584
attribute boolean enableOneTouchLocking = 41;
579585
attribute boolean enablePrivacyModeButton = 43;
580586
attribute int8u wrongCodeEntryLimit = 48;

‎examples/tv-casting-app/tv-casting-common/tv-casting-app.matter

+9-3
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,12 @@ server cluster DoorLock = 257 {
922922
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
923923
}
924924

925+
bitmap DlCredentialRuleMask : BITMAP8 {
926+
kSingle = 0x1;
927+
kDual = 0x2;
928+
kTri = 0x4;
929+
}
930+
925931
bitmap DlCredentialRulesSupport : BITMAP8 {
926932
kSingle = 0x1;
927933
kDual = 0x2;
@@ -1110,13 +1116,13 @@ server cluster DoorLock = 257 {
11101116
readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
11111117
readonly attribute int8u maxPINCodeLength = 23;
11121118
readonly attribute int8u minPINCodeLength = 24;
1113-
readonly attribute bitmap8 credentialRulesSupport = 27;
1119+
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
11141120
attribute char_string<3> language = 33;
11151121
attribute int32u autoRelockTime = 35;
11161122
attribute int8u soundVolume = 36;
11171123
attribute DlOperatingMode operatingMode = 37;
1118-
readonly attribute bitmap16 supportedOperatingModes = 38;
1119-
readonly attribute bitmap16 defaultConfigurationRegister = 39;
1124+
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
1125+
readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
11201126
attribute boolean enableOneTouchLocking = 41;
11211127
attribute boolean enableInsideStatusLED = 42;
11221128
attribute boolean enablePrivacyModeButton = 43;

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

+20-13
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ limitations under the License.
109109
<!-- Conformance feature RID - for now optional -->
110110
<attribute side="server" code="26" define="MIN_RFID_CODE_LENGTH" type="INT8U" writable="false" optional="true">MinRFIDCodeLength</attribute>
111111
<!-- Conformance feature USR - for now optional -->
112-
<attribute side="server" code="27" define="CREDENTIAL_RULES_SUPPORT" type="BITMAP8" min="0x00" max="0x07" default="1" writable="false" optional="true">CredentialRulesSupport</attribute>
112+
<attribute side="server" code="27" define="CREDENTIAL_RULES_SUPPORT" type="DlCredentialRuleMask" min="0x00" max="0xFF" default="1" writable="false" optional="true">CredentialRulesSupport</attribute>
113113
<!-- Conformance feature LOG - for now optional -->
114114
<attribute side="server" code="32" define="ENABLE_LOGGING" type="boolean" reportable="true" default="0" writable="true" optional="true">
115115
<description>EnableLogging</description>
@@ -141,8 +141,8 @@ limitations under the License.
141141
<access op="read" role="view" />
142142
<access op="write" role="manage" />
143143
</attribute>
144-
<attribute side="server" code="38" define="SUPPORTED_OPERATING_MODES" type="BITMAP16" min="0x0000" max="0xFFFF" default="0xFFF6" writable="false">SupportedOperatingModes</attribute>
145-
<attribute side="server" code="39" define="DEFAULT_CONFIGURATION_REGISTER" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0" writable="false" optional="true">DefaultConfigurationRegister</attribute>
144+
<attribute side="server" code="38" define="SUPPORTED_OPERATING_MODES" type="DlSupportedOperatingModes" min="0x0000" max="0xFFFF" default="0xFFF6" writable="false">SupportedOperatingModes</attribute>
145+
<attribute side="server" code="39" define="DEFAULT_CONFIGURATION_REGISTER" type="DlDefaultConfigurationRegister" min="0x0000" max="0xFFFF" reportable="true" default="0" writable="false" optional="true">DefaultConfigurationRegister</attribute>
146146
<attribute side="server" code="40" define="ENABLE_LOCAL_PROGRAMMING" type="boolean" reportable="true" default="1" writable="true" optional="true">
147147
<description>EnableLocalProgramming</description>
148148
<access op="read" role="view" />
@@ -163,7 +163,7 @@ limitations under the License.
163163
<access op="read" role="view" />
164164
<access op="write" role="manage" />
165165
</attribute>
166-
<attribute side="server" code="44" define="LOCAL_PROGRAMMING_FEATURES" type="BITMAP8" min="0x0" max="0x0F" reportable="true" default="0" writable="true" optional="true">
166+
<attribute side="server" code="44" define="LOCAL_PROGRAMMING_FEATURES" type="DlLocalProgrammingFeatures" min="0x0" max="0x0F" reportable="true" default="0" writable="true" optional="true">
167167
<description>LocalProgrammingFeatures</description>
168168
<access op="read" role="view" />
169169
<access op="write" role="administer" />
@@ -199,49 +199,49 @@ limitations under the License.
199199
<access op="read" role="view" />
200200
<access op="write" role="administer" />
201201
</attribute>
202-
<attribute side="server" code="64" define="ALARM_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
202+
<attribute side="server" code="64" define="ALARM_MASK" type="DlAlarmMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
203203
<description>AlarmMask</description>
204204
<access op="read" role="view" />
205205
<access op="write" role="administer" />
206206
</attribute>
207207
<!-- Conformance feature [NOT & PIN] - for now optional -->
208-
<attribute side="server" code="65" define="KEYPAD_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
208+
<attribute side="server" code="65" define="KEYPAD_OPERATION_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
209209
<description>KeypadOperationEventMask</description>
210210
<access op="read" role="view" />
211211
<access op="write" role="administer" />
212212
</attribute>
213213
<!-- Conformance feature [NOT] - for now optional -->
214-
<attribute side="server" code="66" define="REMOTE_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
214+
<attribute side="server" code="66" define="REMOTE_OPERATION_EVENT_MASK" type="DlRemoteOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
215215
<description>RemoteOperationEventMask</description>
216216
<access op="read" role="view" />
217217
<access op="write" role="administer" />
218218
</attribute>
219219
<!-- Conformance feature [NOT] - for now optional -->
220-
<attribute side="server" code="67" define="MANUAL_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
220+
<attribute side="server" code="67" define="MANUAL_OPERATION_EVENT_MASK" type="DlManualOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
221221
<description>ManualOperationEventMask</description>
222222
<access op="read" role="view" />
223223
<access op="write" role="administer" />
224224
</attribute>
225225
<!-- Conformance feature [NOT & RID] - for now optional -->
226-
<attribute side="server" code="68" define="RFID_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
226+
<attribute side="server" code="68" define="RFID_OPERATION_EVENT_MASK" type="DlRFIDOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
227227
<description>RFIDOperationEventMask</description>
228228
<access op="read" role="view" />
229229
<access op="write" role="administer" />
230230
</attribute>
231231
<!-- Conformance feature [NOT & PIN] - for now optional -->
232-
<attribute side="server" code="69" define="KEYPAD_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
232+
<attribute side="server" code="69" define="KEYPAD_PROGRAMMING_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
233233
<description>KeypadProgrammingEventMask</description>
234234
<access op="read" role="view" />
235235
<access op="write" role="administer" />
236236
</attribute>
237237
<!-- Conformance feature [NOT] - for now optional -->
238-
<attribute side="server" code="70" define="REMOTE_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
238+
<attribute side="server" code="70" define="REMOTE_PROGRAMMING_EVENT_MASK" type="DlRemoteProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
239239
<description>RemoteProgrammingEventMask</description>
240240
<access op="read" role="view" />
241241
<access op="write" role="administer" />
242242
</attribute>
243243
<!-- Conformance feature [NOT & RID] - for now optional -->
244-
<attribute side="server" code="71" define="RFID_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
244+
<attribute side="server" code="71" define="RFID_PROGRAMMING_EVENT_MASK" type="DlRFIDProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
245245
<description>RFIDProgrammingEventMask</description>
246246
<access op="read" role="view" />
247247
<access op="write" role="administer" />
@@ -663,6 +663,13 @@ limitations under the License.
663663
<item value="2" name="Tri" />
664664
</enum>
665665

666+
<bitmap name="DlCredentialRuleMask" type="BITMAP8">
667+
<cluster code="0x0101" />
668+
<field mask="0x01" name="Single" />
669+
<field mask="0x02" name="Dual" />
670+
<field mask="0x04" name="Tri" />
671+
</bitmap>
672+
666673
<struct name="DlCredential">
667674
<cluster code="0x0101" />
668675
<item name="CredentialType" type="DlCredentialType" />
@@ -882,7 +889,7 @@ limitations under the License.
882889
<field mask="0x40" name="UnlockInvalidSchedule" />
883890
</bitmap>
884891

885-
<!-- RemoteOperationEventMask attribute bit meaning set -->
892+
<!-- ManualOperationEventMask attribute bit meaning set -->
886893
<bitmap name="DlManualOperationEventMask" type="BITMAP16">
887894
<cluster code="0x0101" />
888895
<field mask="0x001" name="Unknown" />

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,12 @@ client cluster DoorLock = 257 {
12491249
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
12501250
}
12511251

1252+
bitmap DlCredentialRuleMask : BITMAP8 {
1253+
kSingle = 0x1;
1254+
kDual = 0x2;
1255+
kTri = 0x4;
1256+
}
1257+
12521258
bitmap DlCredentialRulesSupport : BITMAP8 {
12531259
kSingle = 0x1;
12541260
kDual = 0x2;
@@ -1440,7 +1446,7 @@ client cluster DoorLock = 257 {
14401446
attribute int32u autoRelockTime = 35;
14411447
attribute int8u soundVolume = 36;
14421448
attribute DlOperatingMode operatingMode = 37;
1443-
readonly attribute bitmap16 supportedOperatingModes = 38;
1449+
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
14441450
attribute boolean enableOneTouchLocking = 41;
14451451
attribute boolean enablePrivacyModeButton = 43;
14461452
attribute int8u wrongCodeEntryLimit = 48;

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

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

‎src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm

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

‎src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm

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

‎src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h

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

‎src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h

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

0 commit comments

Comments
 (0)