Skip to content

Commit

Permalink
Updated the door-lock-cluster.xml door-lock-cluster.xml to use the sp…
Browse files Browse the repository at this point in the history 
…ecifications type definitions, instead of using the enum* directly (project-chip#15528). (project-chip#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.
  • Loading branch information
@hubTab @andrei-menzopol
hubTab authored and andrei-menzopol committed Apr 14, 2022
1 parent 124e303 commit 0da9750
Show file tree
Hide file tree
Showing 20 changed files with 333 additions and 201 deletions.
12 changes: 9 additions & 3 deletions 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 @@ -963,6 +963,12 @@ server cluster DoorLock = 257 {
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
}

bitmap DlCredentialRuleMask : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
kTri = 0x4;
}

bitmap DlCredentialRulesSupport : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
Expand Down Expand Up @@ -1154,13 +1160,13 @@ server cluster DoorLock = 257 {
readonly attribute int8u minPINCodeLength = 24;
readonly attribute int8u maxRFIDCodeLength = 25;
readonly attribute int8u minRFIDCodeLength = 26;
readonly attribute bitmap8 credentialRulesSupport = 27;
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
attribute char_string<3> language = 33;
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
readonly attribute bitmap16 supportedOperatingModes = 38;
readonly attribute bitmap16 defaultConfigurationRegister = 39;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
attribute boolean enableOneTouchLocking = 41;
attribute boolean enableInsideStatusLED = 42;
attribute boolean enablePrivacyModeButton = 43;
Expand Down
10 changes: 8 additions & 2 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,12 @@ server cluster DoorLock = 257 {
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
}

bitmap DlCredentialRuleMask : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
kTri = 0x4;
}

bitmap DlCredentialRulesSupport : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
Expand Down Expand Up @@ -569,12 +575,12 @@ server cluster DoorLock = 257 {
readonly attribute int8u minPINCodeLength = 24;
readonly attribute int8u maxRFIDCodeLength = 25;
readonly attribute int8u minRFIDCodeLength = 26;
readonly attribute bitmap8 credentialRulesSupport = 27;
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
attribute char_string<3> language = 33;
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
readonly attribute bitmap16 supportedOperatingModes = 38;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
attribute boolean enableOneTouchLocking = 41;
attribute boolean enablePrivacyModeButton = 43;
attribute int8u wrongCodeEntryLimit = 48;
Expand Down
12 changes: 9 additions & 3 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,12 @@ server cluster DoorLock = 257 {
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
}

bitmap DlCredentialRuleMask : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
kTri = 0x4;
}

bitmap DlCredentialRulesSupport : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
Expand Down Expand Up @@ -1110,13 +1116,13 @@ server cluster DoorLock = 257 {
readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
readonly attribute int8u maxPINCodeLength = 23;
readonly attribute int8u minPINCodeLength = 24;
readonly attribute bitmap8 credentialRulesSupport = 27;
readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
attribute char_string<3> language = 33;
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
readonly attribute bitmap16 supportedOperatingModes = 38;
readonly attribute bitmap16 defaultConfigurationRegister = 39;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
attribute boolean enableOneTouchLocking = 41;
attribute boolean enableInsideStatusLED = 42;
attribute boolean enablePrivacyModeButton = 43;
Expand Down
33 changes: 20 additions & 13 deletions src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ limitations under the License.
<!-- Conformance feature RID - for now optional -->
<attribute side="server" code="26" define="MIN_RFID_CODE_LENGTH" type="INT8U" writable="false" optional="true">MinRFIDCodeLength</attribute>
<!-- Conformance feature USR - for now optional -->
<attribute side="server" code="27" define="CREDENTIAL_RULES_SUPPORT" type="BITMAP8" min="0x00" max="0x07" default="1" writable="false" optional="true">CredentialRulesSupport</attribute>
<attribute side="server" code="27" define="CREDENTIAL_RULES_SUPPORT" type="DlCredentialRuleMask" min="0x00" max="0xFF" default="1" writable="false" optional="true">CredentialRulesSupport</attribute>
<!-- Conformance feature LOG - for now optional -->
<attribute side="server" code="32" define="ENABLE_LOGGING" type="boolean" reportable="true" default="0" writable="true" optional="true">
<description>EnableLogging</description>
Expand Down Expand Up @@ -141,8 +141,8 @@ limitations under the License.
<access op="read" role="view" />
<access op="write" role="manage" />
</attribute>
<attribute side="server" code="38" define="SUPPORTED_OPERATING_MODES" type="BITMAP16" min="0x0000" max="0xFFFF" default="0xFFF6" writable="false">SupportedOperatingModes</attribute>
<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>
<attribute side="server" code="38" define="SUPPORTED_OPERATING_MODES" type="DlSupportedOperatingModes" min="0x0000" max="0xFFFF" default="0xFFF6" writable="false">SupportedOperatingModes</attribute>
<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>
<attribute side="server" code="40" define="ENABLE_LOCAL_PROGRAMMING" type="boolean" reportable="true" default="1" writable="true" optional="true">
<description>EnableLocalProgramming</description>
<access op="read" role="view" />
Expand All @@ -163,7 +163,7 @@ limitations under the License.
<access op="read" role="view" />
<access op="write" role="manage" />
</attribute>
<attribute side="server" code="44" define="LOCAL_PROGRAMMING_FEATURES" type="BITMAP8" min="0x0" max="0x0F" reportable="true" default="0" writable="true" optional="true">
<attribute side="server" code="44" define="LOCAL_PROGRAMMING_FEATURES" type="DlLocalProgrammingFeatures" min="0x0" max="0x0F" reportable="true" default="0" writable="true" optional="true">
<description>LocalProgrammingFeatures</description>
<access op="read" role="view" />
<access op="write" role="administer" />
Expand Down Expand Up @@ -199,49 +199,49 @@ limitations under the License.
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<attribute side="server" code="64" define="ALARM_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="64" define="ALARM_MASK" type="DlAlarmMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>AlarmMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT & PIN] - for now optional -->
<attribute side="server" code="65" define="KEYPAD_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="65" define="KEYPAD_OPERATION_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>KeypadOperationEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT] - for now optional -->
<attribute side="server" code="66" define="REMOTE_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="66" define="REMOTE_OPERATION_EVENT_MASK" type="DlRemoteOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>RemoteOperationEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT] - for now optional -->
<attribute side="server" code="67" define="MANUAL_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="67" define="MANUAL_OPERATION_EVENT_MASK" type="DlManualOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>ManualOperationEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT & RID] - for now optional -->
<attribute side="server" code="68" define="RFID_OPERATION_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="68" define="RFID_OPERATION_EVENT_MASK" type="DlRFIDOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>RFIDOperationEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT & PIN] - for now optional -->
<attribute side="server" code="69" define="KEYPAD_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="69" define="KEYPAD_PROGRAMMING_EVENT_MASK" type="DlKeypadOperationEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>KeypadProgrammingEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT] - for now optional -->
<attribute side="server" code="70" define="REMOTE_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="70" define="REMOTE_PROGRAMMING_EVENT_MASK" type="DlRemoteProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>RemoteProgrammingEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
</attribute>
<!-- Conformance feature [NOT & RID] - for now optional -->
<attribute side="server" code="71" define="RFID_PROGRAMMING_EVENT_MASK" type="BITMAP16" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<attribute side="server" code="71" define="RFID_PROGRAMMING_EVENT_MASK" type="DlRFIDProgrammingEventMask" min="0x0000" max="0xFFFF" reportable="true" default="0xFFFF" writable="true" optional="true">
<description>RFIDProgrammingEventMask</description>
<access op="read" role="view" />
<access op="write" role="administer" />
Expand Down Expand Up @@ -663,6 +663,13 @@ limitations under the License.
<item value="2" name="Tri" />
</enum>

<bitmap name="DlCredentialRuleMask" type="BITMAP8">
<cluster code="0x0101" />
<field mask="0x01" name="Single" />
<field mask="0x02" name="Dual" />
<field mask="0x04" name="Tri" />
</bitmap>

<struct name="DlCredential">
<cluster code="0x0101" />
<item name="CredentialType" type="DlCredentialType" />
Expand Down Expand Up @@ -882,7 +889,7 @@ limitations under the License.
<field mask="0x40" name="UnlockInvalidSchedule" />
</bitmap>

<!-- RemoteOperationEventMask attribute bit meaning set -->
<!-- ManualOperationEventMask attribute bit meaning set -->
<bitmap name="DlManualOperationEventMask" type="BITMAP16">
<cluster code="0x0101" />
<field mask="0x001" name="Unknown" />
Expand Down
8 changes: 7 additions & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,12 @@ client cluster DoorLock = 257 {
kForcedDoorOpenUnderDoorLockedCondition = 0x40;
}

bitmap DlCredentialRuleMask : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
kTri = 0x4;
}

bitmap DlCredentialRulesSupport : BITMAP8 {
kSingle = 0x1;
kDual = 0x2;
Expand Down Expand Up @@ -1440,7 +1446,7 @@ client cluster DoorLock = 257 {
attribute int32u autoRelockTime = 35;
attribute int8u soundVolume = 36;
attribute DlOperatingMode operatingMode = 37;
readonly attribute bitmap16 supportedOperatingModes = 38;
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
attribute boolean enableOneTouchLocking = 41;
attribute boolean enablePrivacyModeButton = 43;
attribute int8u wrongCodeEntryLimit = 48;
Expand Down
2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
View file

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

24 changes: 24 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
View file

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

30 changes: 30 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h
View file

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

6 changes: 6 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
View file

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

Loading

0 comments on commit 0da9750

Please sign in to comment.