Skip to content

Commit

Permalink
DM XMLs: Remove some in-progress that are not going to cert. (project…
Browse files Browse the repository at this point in the history 
…-chip#32294)

Removing LIT-icd, aliro, per device credentials
  • Loading branch information
@cecille
cecille authored Feb 24, 2024
1 parent 22bb737 commit c5a0720
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 286 deletions.
181 changes: 9 additions & 172 deletions data_model/clusters/DoorLock.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock" revision="8">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock" revision="7">
<revisionHistory>
<revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1811 1812 1821"/>
<revision revision="2" summary="CCB 2430"/>
Expand All @@ -66,7 +66,6 @@ Davis, CA 95616, USA
<revision revision="5"/>
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
<revision revision="8" summary="Added support for Aliro credential provisioning"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0101" name="Door Lock"/>
Expand Down Expand Up @@ -104,19 +103,14 @@ Davis, CA 95616, USA
<optionalConform/>
</feature>
<feature bit="8" code="USR" name="User" summary="Lock supports the user commands and database">
<otherwiseConform>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<optionalConform>
<orTerm>
<feature name="PIN"/>
<feature name="RID"/>
<feature name="FGP"/>
<feature name="FACE"/>
</orTerm>
</optionalConform>
</otherwiseConform>
<optionalConform>
<orTerm>
<feature name="PIN"/>
<feature name="RID"/>
<feature name="FGP"/>
<feature name="FACE"/>
</orTerm>
</optionalConform>
</feature>
<feature bit="9" code="NOT" name="Notification" summary="Operation and Programming Notifications">
<optionalConform/>
Expand All @@ -130,14 +124,6 @@ Davis, CA 95616, USA
<feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
<optionalConform/>
</feature>
<feature bit="13" code="ALIRO" name="AliroProvisioning" summary="Lock supports Aliro credential provisioning as defined in ref_Aliro">
<optionalConform/>
</feature>
<feature bit="14" code="ALBU" name="AliroBLEUWB" summary="Lock supports the Bluetooth LE + UWB Access Control Flow as defined in ref_Aliro">
<optionalConform>
<feature name="ALIRO"/>
</optionalConform>
</feature>
</features>
<dataTypes>
<enum name="AlarmCodeEnum">
Expand Down Expand Up @@ -220,23 +206,6 @@ Davis, CA 95616, USA
<feature name="FACE"/>
</mandatoryConform>
</item>
<item value="6" name="AliroCredentialIssuerKey" summary="A Credential Issuer public key as defined in ref_Aliro">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
<item value="7" name="AliroEvictableEndpointKey" summary="An Endpoint public key as defined in ref_Aliro which can
be evicted if space is needed for another endpoint key">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
<item value="8" name="AliroNonEvictableEndpointKey" summary="An Endpoint public key as defined in ref_Aliro which cannot
be evicted if space is needed for another endpoint key">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
</enum>
<enum name="DataOperationTypeEnum">
<item value="0" name="Add" summary="Data is being added or was added">
Expand Down Expand Up @@ -370,21 +339,6 @@ Davis, CA 95616, USA
<feature name="FACE"/>
</mandatoryConform>
</item>
<item value="11" name="AliroCredentialIssuerKey" summary="An Aliro credential issuer key credential was added, cleared, or modified.">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
<item value="12" name="AliroEvictableEndpointKey" summary="An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified.">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
<item value="13" name="AliroNonEvictableEndpointKey" summary="An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified.">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
</enum>
<enum name="LockOperationTypeEnum">
<item value="0" name="Lock" summary="Lock operation">
Expand Down Expand Up @@ -533,11 +487,6 @@ Davis, CA 95616, USA
<feature name="USR"/>
</optionalConform>
</item>
<item value="10" name="Aliro" summary="User change operation was a step-up credential provisioning as defined in ref_Aliro">
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</item>
</enum>
<enum name="SoundVolumeEnum">
<item value="0" name="Silent" summary="Silent Mode">
Expand Down Expand Up @@ -1109,81 +1058,6 @@ Davis, CA 95616, USA
</andTerm>
</optionalConform>
</attribute>
<attribute id="0x0080" name="AliroReaderVerificationKey" type="octstr" default="null">
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<constraint type="maxLength" value="65"/>
</attribute>
<attribute id="0x0081" name="AliroReaderGroupIdentifier" type="octstr" default="null">
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<constraint type="maxLength" value="16"/>
</attribute>
<attribute id="0x0082" name="AliroReaderGroupSubIdentifier" type="octstr">
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<constraint type="maxLength" value="16"/>
</attribute>
<attribute id="0x0083" name="AliroExpeditedTransactionSupportedProtocolVersions" type="list" default="empty">
<entry type="octstr">
<constraint type="maxLength" value="2"/>
</entry>
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<constraint type="maxCount" value="16"/>
</attribute>
<attribute id="0x0084" name="AliroGroupResolvingKey" type="octstr" default="null">
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="ALBU"/>
</mandatoryConform>
<constraint type="maxLength" value="16"/>
</attribute>
<attribute id="0x0085" name="AliroSupportedBLEUWBProtocolVersions" type="list" default="empty">
<entry type="octstr">
<constraint type="maxLength" value="2"/>
</entry>
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALBU"/>
</mandatoryConform>
<constraint type="maxCount" value="16"/>
</attribute>
<attribute id="0x0086" name="AliroBLEAdvertisingVersion" type="uint8" default="0">
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALBU"/>
</mandatoryConform>
</attribute>
<attribute id="0x0087" name="NumberOfAliroCredentialIssuerKeysSupported" type="uint16" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</attribute>
<attribute id="0x0088" name="NumberOfAliroEndpointKeysSupported" type="uint16" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</attribute>
</attributes>
<commands>
<command id="0x00" name="LockDoor" direction="commandToServer" response="Y">
Expand Down Expand Up @@ -2059,13 +1933,6 @@ Davis, CA 95616, USA
<optionalConform/>
<constraint type="desc"/>
</field>
<field id="5" name="CredentialData" type="octstr">
<quality nullable="true"/>
<optionalConform>
<feature name="ALIRO"/>
</optionalConform>
<constraint type="desc"/>
</field>
</command>
<command id="0x26" name="ClearCredential" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
Expand All @@ -2092,36 +1959,6 @@ Davis, CA 95616, USA
</optionalConform>
</field>
</command>
<command id="0x28" name="SetAliroReaderConfig" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
<field id="0" name="SigningKey" type="octstr">
<mandatoryConform/>
<constraint type="maxLength" value="32"/>
</field>
<field id="1" name="VerificationKey" type="octstr">
<mandatoryConform/>
<constraint type="maxLength" value="65"/>
</field>
<field id="2" name="GroupIdentifier" type="octstr">
<mandatoryConform/>
<constraint type="maxLength" value="16"/>
</field>
<field id="3" name="GroupResolvingKey" type="octstr">
<mandatoryConform>
<feature name="ALBU"/>
</mandatoryConform>
<constraint type="maxLength" value="16"/>
</field>
</command>
<command id="0x29" name="ClearAliroReaderConfig" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform>
<feature name="ALIRO"/>
</mandatoryConform>
</command>
</commands>
<events>
<event id="0x00" name="DoorLockAlarm" priority="critical">
Expand Down
38 changes: 2 additions & 36 deletions data_model/clusters/ICDManagement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@ Davis, CA 95616, USA
// Update Name
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management" revision="2">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
<revision revision="2" summary="Addition of LIT ICD support, UserActiveModeTrigger, ActiveModeDuration, StayActiveResponse; removal of field Key in MonitoringRegistrationStruct"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0046" name="ICDManagement"/>
Expand All @@ -69,26 +68,12 @@ Davis, CA 95616, USA
<features>
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
<otherwiseConform>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
<optionalConform/>
</otherwiseConform>
</feature>
<feature bit="1" code="UAT" name="UserActiveModeTrigger" summary="Device supports the user active mode trigger feature.">
<otherwiseConform>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
<provisionalConform/>
<optionalConform/>
</otherwiseConform>
</feature>
<feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
<optionalConform/>
</feature>
</features>
<dataTypes>
<number name="UserActiveModeTriggerBitmap" type=""/>
<enum name="OperatingModeEnum">
<item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
<mandatoryConform/>
Expand Down Expand Up @@ -153,25 +138,6 @@ Davis, CA 95616, USA
</mandatoryConform>
<constraint type="min" value="1"/>
</attribute>
<attribute id="0x0006" name="UserActiveModeTriggerHint" type="UserActiveModeTriggerBitmap" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform>
<feature name="UAT"/>
</mandatoryConform>
<constraint type="desc"/>
</attribute>
<attribute id="0x0007" name="UserActiveModeTriggerInstruction" type="string" default="&quot;">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<constraint type="maxLength" value="128"/>
</attribute>
<attribute id="0x0008" name="OperatingMode" type="OperatingModeEnum">
<access read="true" readPrivilege="view"/>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
</attribute>
</attributes>
<commands>
<command id="0x00" name="RegisterClient" direction="commandToServer" response="RegisterClientResponse">
Expand Down
Loading

0 comments on commit c5a0720

Please sign in to comment.