Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/wifi_RS9116_fixes_for_hardfault_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhmanda-silabs
bhmanda-silabs authored Feb 26, 2024
2 parents eeecacc + 8f2a4d2 commit 997e5d5
Show file tree
Hide file tree
Showing 90 changed files with 2,022 additions and 564 deletions.
19 changes: 19 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,25 @@ endif()

if(CONFIG_ENABLE_ICD_SERVER)
chip_gn_arg_append("chip_enable_icd_server" "true")
if(CONFIG_ICD_ENFORCE_SIT_SLOW_POLL_LIMIT)
chip_gn_arg_append("icd_enforce_sit_slow_poll_limit" "true")
endif()
if(CONFIG_ICD_REPORT_ON_ACTIVE_MODE)
chip_gn_arg_append("chip_icd_report_on_active_mode" "true")
endif()
if(CONFIG_ENABLE_ICD_LIT)
chip_gn_arg_append("chip_enable_icd_lit" "true")
if(CONFIG_ENABLE_ICD_CIP)
chip_gn_arg_append("chip_enable_icd_checkin" "true")
else()
chip_gn_arg_append("chip_enable_icd_checkin" "false")
endif()
if(CONFIG_ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER)
chip_gn_arg_append("chip_enable_icd_user_active_mode_trigger" "true")
else()
chip_gn_arg_append("chip_enable_icd_user_active_mode_trigger" "false")
endif()
endif()
endif()

if(CONFIG_ENABLE_PW_RPC)
Expand Down
52 changes: 50 additions & 2 deletions config/esp32/components/chip/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,27 @@ menu "CHIP Device Layer"
help
Enables or Disables the support for Commissionable Device Type.

config ENABLE_ICD_SERVER
menuconfig ENABLE_ICD_SERVER
bool "Enable ICD server"
depends on OPENTHREAD_MTD
default n
help
Enables or Disables ICD server

config ICD_ENFORCE_SIT_SLOW_POLL_LIMIT
bool "Enforce SIT Slow Polling Max value to 15 seconds"
depends on ENABLE_ICD_SERVER
default n
help
Set to true to enforce SIT Slow Polling Max value to 15seconds

config ICD_REPORT_ON_ACTIVE_MODE
bool "Emit a report on entering active mode"
depends on ENABLE_ICD_SERVER
default n
help
Make the ICD manager emit a report on entering active mode

config ICD_SLOW_POLL_INTERVAL_MS
int "ICD Slow Polling Interval(ms)"
depends on ENABLE_ICD_SERVER
Expand Down Expand Up @@ -389,14 +403,48 @@ menu "CHIP Device Layer"
This value indicates the minimum amount of time in milliseconds the server typically
will stay active after network activity when in active mode.

config ENABLE_ICD_LIT
bool "Enable Long Idle Time ICD"
depends on ENABLE_ICD_SERVER
default n
help
Enables or Disables LIT ICD

config ENABLE_ICD_CIP
bool "Enable Check-in protocol"
depends on ENABLE_ICD_LIT
default y
help
Enables or Disables ICD Check-in protocol

config ICD_CLIENTS_SUPPORTED_PER_FABRIC
int "ICD Clients Number Supported Per Fabric"
depends on ENABLE_ICD_SERVER
depends on ENABLE_ICD_CIP
default 1
help
This value indicates the maximum number of entries that the ICD server is able to store
for each fabric in the RegisteredClients attribute.

config ICD_MAX_NOTIFICATION_SUBSCRIBERS
int "Max ICD notification subscribers"
depends on ENABLE_ICD_SERVER
default 1
help
The ICDManager implements the ICDListener functions and is always subscribed to the ICDNotifier
This allows other Matter modules to inform the ICDManager that it needs to go and may have to stay in Active Mode,
outside of its standard ActiveModeDuration and IdleModeDuration, without being tightly coupled the application
data model

This implementation also allows other modules to implement an ICDListener and subscribe to ICDNotifier
to couple behaviours with the ICD cycles. In such cases, ICD_MAX_NOTIFICATION_SUBSCRIBERS need to be adjusted

config ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER
bool "Enable User Active Mode Trigger feature"
depends on ENABLE_ICD_LIT
default y
help
Enables or Disables ICD User Active Mode Trigger feature

config ENABLE_BG_EVENT_PROCESSING
bool "Enable Background event processing"
default n
Expand Down
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
Loading

0 comments on commit 997e5d5

Please sign in to comment.