Skip to content

Commit 7507a84

Browse files
author
Miecznik Rafal
committed
CI/CD: Synchronize ncs-aliro@499af27027ac and ncs-door-lock-app
Source commit ID: @499af27027ac sync-ncs-aliro-499af27027ac Signed-off-by: Miecznik Rafal <miecznik.rafal@nordicsemi.com>
1 parent 5d75282 commit 7507a84

113 files changed

Lines changed: 4621 additions & 2959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ NCS manifest repo for the door lock reference application.
55

66
Before getting started, set up the nRF Connect SDK development environment.
77

8-
Follow the official [Installing the nRF Connect SDK](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html) guide and complete the following steps:
8+
Follow the official [Installing the nRF Connect SDK](https://docs.nordicsemi.com/bundle/ncs-3.2.0/page/nrf/installation/install_ncs.html) guide and complete the following steps:
99

10-
- [Update operating system](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#update_operating_system)
11-
- [Install prerequisites](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#install_prerequisites)
12-
- [Install the nRF Connect SDK toolchain](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#install_the_nrf_connect_sdk_toolchain)
10+
- [Update operating system](https://docs.nordicsemi.com/bundle/ncs-3.2.0/page/nrf/installation/install_ncs.html#update_operating_system)
11+
- [Install prerequisites](https://docs.nordicsemi.com/bundle/ncs-3.2.0/page/nrf/installation/install_ncs.html#install_prerequisites)
12+
- [Install the nRF Connect SDK toolchain](https://docs.nordicsemi.com/bundle/ncs-3.2.0/page/nrf/installation/install_ncs.html#install_the_nrf_connect_sdk_toolchain)
1313

1414
### Initialization
1515

@@ -19,8 +19,8 @@ the ``ncs-door-lock-app`` and all nRF Connect SDK modules will be cloned.
1919
Run the following commands:
2020

2121
```shell
22-
# launch nRF Connect toolchain for v3.2.0-preview2 release
23-
nrfutil sdk-manager toolchain launch --ncs-version v3.2.0-preview2 --shell
22+
# launch nRF Connect toolchain for v3.2.0 release
23+
nrfutil sdk-manager toolchain launch --ncs-version v3.2.0 --shell
2424
```
2525

2626
```shell

app/prj.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ CONFIG_SHELL_BACKEND_SERIAL_LOG_MESSAGE_QUEUE_SIZE=2048
5656
# RFAL worker stack size (TODO: optimize)
5757
CONFIG_RFAL_WORKER_THREAD_STACK_SIZE=8192
5858

59-
# Workaournd for Murata issue:
60-
# https://github.com/csa-access-control/aliro-actuator/issues/114
61-
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
62-
6359
# Override default values to match Aliro requirements for APDU message sizes.
6460
CONFIG_BT_BUF_ACL_RX_SIZE=271
6561
CONFIG_BT_BUF_ACL_TX_SIZE=271
@@ -79,6 +75,10 @@ CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
7975
# Suspend devices when the CPU goes into sleep
8076
CONFIG_PM_DEVICE=y
8177

78+
# Disable enabling PM runtime for all devices by default, as suspending UART
79+
# causes SHELL to be non-responsive.
80+
CONFIG_PM_DEVICE_RUNTIME_DEFAULT_ENABLE=n
81+
8282
# Try to disable unused RAM blocks to reduce power consumption
8383
CONFIG_RAM_POWER_DOWN_LIBRARY=y
8484

app/snippets/schedules/lock.matter

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ enum ThreeLevelAutoEnum : enum8 {
245245
}
246246

247247
enum WebRTCEndReasonEnum : enum8 {
248-
kIceFailed = 0;
249-
kIceTimeout = 1;
248+
kICEFailed = 0;
249+
kICETimeout = 1;
250250
kUserHangup = 2;
251251
kUserBusy = 3;
252252
kReplaced = 4;
@@ -256,7 +256,8 @@ enum WebRTCEndReasonEnum : enum8 {
256256
kOutOfResources = 8;
257257
kMediaTimeout = 9;
258258
kLowPower = 10;
259-
kUnknownReason = 11;
259+
kPrivacyMode = 11;
260+
kUnknownReason = 12;
260261
}
261262

262263
bitmap TestGlobalBitmap : bitmap32 {
@@ -323,6 +324,13 @@ struct PowerThresholdStruct {
323324
nullable PowerThresholdSourceEnum powerThresholdSource = 2;
324325
}
325326

327+
struct SemanticTagStruct {
328+
nullable vendor_id mfgCode = 0;
329+
enum8 namespaceID = 1;
330+
enum8 tag = 2;
331+
optional nullable char_string<64> label = 3;
332+
}
333+
326334
struct TestGlobalStruct {
327335
char_string<128> name = 0;
328336
nullable TestGlobalBitmap myBitmap = 1;
@@ -343,13 +351,13 @@ fabric_scoped struct WebRTCSessionStruct {
343351
StreamUsageEnum streamUsage = 3;
344352
nullable int16u videoStreamID = 4;
345353
nullable int16u audioStreamID = 5;
346-
optional boolean metadataEnabled = 6;
354+
boolean metadataEnabled = 6;
347355
fabric_idx fabricIndex = 254;
348356
}
349357

350358
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
351359
cluster Identify = 3 {
352-
revision 5;
360+
revision 6;
353361

354362
enum EffectIdentifierEnum : enum8 {
355363
kBlink = 0;
@@ -409,13 +417,6 @@ cluster Descriptor = 29 {
409417
int16u revision = 1;
410418
}
411419

412-
struct SemanticTagStruct {
413-
nullable vendor_id mfgCode = 0;
414-
enum8 namespaceID = 1;
415-
enum8 tag = 2;
416-
optional nullable char_string<64> label = 3;
417-
}
418-
419420
readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
420421
readonly attribute cluster_id serverList[] = 1;
421422
readonly attribute cluster_id clientList[] = 2;
@@ -799,7 +800,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
799800
}
800801

801802
/** Announce the presence of an OTA Provider */
802-
command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
803+
command access(invoke: administer) AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
803804
}
804805

805806
/** This cluster is used to manage global aspects of the Commissioning flow. */
@@ -851,6 +852,7 @@ cluster GeneralCommissioning = 48 {
851852
provisional readonly attribute access(read: administer) optional nullable int32u TCUpdateDeadline = 9;
852853
provisional readonly attribute access(read: manage) optional octet_string<8> recoveryIdentifier = 10;
853854
provisional readonly attribute access(read: manage) optional nullable NetworkRecoveryReasonEnum networkRecoveryReason = 11;
855+
provisional readonly attribute optional boolean isCommissioningWithoutPower = 12;
854856
readonly attribute command_id generatedCommandList[] = 65528;
855857
readonly attribute command_id acceptedCommandList[] = 65529;
856858
readonly attribute attrib_id attributeList[] = 65531;
@@ -1595,15 +1597,15 @@ cluster TimeSynchronization = 56 {
15951597
nullable char_string<128> defaultNTP = 0;
15961598
}
15971599

1598-
/** This command MAY be issued by Administrator to set the time. */
1600+
/** This command is used to set the UTC time of the node. */
15991601
command access(invoke: administer) SetUTCTime(SetUTCTimeRequest): DefaultSuccess = 0;
1600-
/** This command SHALL set TrustedTimeSource. */
1602+
/** This command is used to set the TrustedTimeSource attribute. */
16011603
fabric command access(invoke: administer) SetTrustedTimeSource(SetTrustedTimeSourceRequest): DefaultSuccess = 1;
1602-
/** This command SHALL set TimeZone. */
1604+
/** This command is used to set the time zone of the node. */
16031605
command access(invoke: manage) SetTimeZone(SetTimeZoneRequest): SetTimeZoneResponse = 2;
1604-
/** This command SHALL set DSTOffset. */
1606+
/** This command is used to set the DST offsets for a node. */
16051607
command access(invoke: manage) SetDSTOffset(SetDSTOffsetRequest): DefaultSuccess = 4;
1606-
/** This command is used to set DefaultNTP. */
1608+
/** This command is used to set the DefaultNTP attribute. */
16071609
command access(invoke: administer) SetDefaultNTP(SetDefaultNTPRequest): DefaultSuccess = 5;
16081610
}
16091611

@@ -1742,21 +1744,21 @@ cluster TimeSynchronization = 56 {
17421744
nullable char_string<128> defaultNTP = 0;
17431745
}
17441746

1745-
/** This command MAY be issued by Administrator to set the time. */
1747+
/** This command is used to set the UTC time of the node. */
17461748
command access(invoke: administer) SetUTCTime(SetUTCTimeRequest): DefaultSuccess = 0;
1747-
/** This command SHALL set TrustedTimeSource. */
1749+
/** This command is used to set the TrustedTimeSource attribute. */
17481750
fabric command access(invoke: administer) SetTrustedTimeSource(SetTrustedTimeSourceRequest): DefaultSuccess = 1;
1749-
/** This command SHALL set TimeZone. */
1751+
/** This command is used to set the time zone of the node. */
17501752
command access(invoke: manage) SetTimeZone(SetTimeZoneRequest): SetTimeZoneResponse = 2;
1751-
/** This command SHALL set DSTOffset. */
1753+
/** This command is used to set the DST offsets for a node. */
17521754
command access(invoke: manage) SetDSTOffset(SetDSTOffsetRequest): DefaultSuccess = 4;
1753-
/** This command is used to set DefaultNTP. */
1755+
/** This command is used to set the DefaultNTP attribute. */
17541756
command access(invoke: administer) SetDefaultNTP(SetDefaultNTPRequest): DefaultSuccess = 5;
17551757
}
17561758

17571759
/** Commands to trigger a Node to allow a new Administrator to commission it. */
17581760
cluster AdministratorCommissioning = 60 {
1759-
revision 1; // NOTE: Default/not specifically set
1761+
revision 1;
17601762

17611763
enum CommissioningWindowStatusEnum : enum8 {
17621764
kWindowNotOpen = 0;
@@ -1785,7 +1787,7 @@ cluster AdministratorCommissioning = 60 {
17851787

17861788
request struct OpenCommissioningWindowRequest {
17871789
int16u commissioningTimeout = 0;
1788-
octet_string PAKEPasscodeVerifier = 1;
1790+
octet_string<97> PAKEPasscodeVerifier = 1;
17891791
int16u discriminator = 2;
17901792
int32u iterations = 3;
17911793
octet_string<32> salt = 4;
@@ -1795,11 +1797,11 @@ cluster AdministratorCommissioning = 60 {
17951797
int16u commissioningTimeout = 0;
17961798
}
17971799

1798-
/** This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method. */
1800+
/** This command is used by a current Administrator to instruct a Node to go into commissioning mode. */
17991801
timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
1800-
/** This command is used by a current Administrator to instruct a Node to go into commissioning mode using basic commissioning method, if the node supports it. */
1802+
/** This command MAY be used by a current Administrator to instruct a Node to go into commissioning mode, if the node supports the Basic Commissioning Method. */
18011803
timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
1802-
/** This command is used by a current Administrator to instruct a Node to revoke any active Open Commissioning Window or Open Basic Commissioning Window command. */
1804+
/** This command is used by a current Administrator to instruct a Node to revoke any active OpenCommissioningWindow or OpenBasicCommissioningWindow command. */
18031805
timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
18041806
}
18051807

@@ -1953,7 +1955,7 @@ cluster OperationalCredentials = 62 {
19531955

19541956
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
19551957
cluster GroupKeyManagement = 63 {
1956-
revision 1; // NOTE: Default/not specifically set
1958+
revision 2;
19571959

19581960
enum GroupKeySecurityPolicyEnum : enum8 {
19591961
kTrustFirst = 0;
@@ -2117,12 +2119,12 @@ cluster IcdManagement = 70 {
21172119
int32u promisedActiveDuration = 0;
21182120
}
21192121

2120-
/** Register a client to the end device */
2122+
/** This command allows a client to register itself with the ICD to be notified when the device is available for communication. */
21212123
fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
2122-
/** Unregister a client from an end device */
2124+
/** This command allows a client to unregister itself with the ICD. */
21232125
fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
2124-
/** Request the end device to stay in Active Mode for an additional ActiveModeThreshold */
2125-
command access(invoke: manage) StayActiveRequest(StayActiveRequestRequest): StayActiveResponse = 3;
2126+
/** This command allows a client to request that the server stays in active mode for at least a given time duration (in milliseconds) from when this command is received. */
2127+
command StayActiveRequest(StayActiveRequestRequest): StayActiveResponse = 3;
21262128
}
21272129

21282130
/** An interface to a generic way to secure a door */
@@ -2777,7 +2779,7 @@ cluster DoorLock = 257 {
27772779
}
27782780

27792781
endpoint 0 {
2780-
device type ma_rootdevice = 22, version 3;
2782+
device type ma_rootdevice = 22, version 4;
27812783
device type ma_otarequestor = 18, version 1;
27822784

27832785
binding cluster OtaSoftwareUpdateProvider;
@@ -2817,7 +2819,7 @@ endpoint 0 {
28172819
callback attribute vendorID;
28182820
callback attribute productName;
28192821
callback attribute productID;
2820-
persist attribute nodeLabel;
2822+
callback attribute nodeLabel;
28212823
callback attribute location;
28222824
callback attribute hardwareVersion;
28232825
callback attribute hardwareVersionString;
@@ -2832,8 +2834,8 @@ endpoint 0 {
28322834
callback attribute generatedCommandList;
28332835
callback attribute acceptedCommandList;
28342836
callback attribute attributeList;
2835-
ram attribute featureMap default = 0;
2836-
ram attribute clusterRevision default = 4;
2837+
callback attribute featureMap;
2838+
callback attribute clusterRevision;
28372839
}
28382840

28392841
server cluster OtaSoftwareUpdateRequestor {
@@ -2854,16 +2856,16 @@ endpoint 0 {
28542856
}
28552857

28562858
server cluster GeneralCommissioning {
2857-
ram attribute breadcrumb default = 0x0000000000000000;
2859+
callback attribute breadcrumb;
28582860
callback attribute basicCommissioningInfo;
28592861
callback attribute regulatoryConfig;
28602862
callback attribute locationCapability;
28612863
callback attribute supportsConcurrentConnection;
28622864
callback attribute generatedCommandList;
28632865
callback attribute acceptedCommandList;
28642866
callback attribute attributeList;
2865-
ram attribute featureMap default = 0;
2866-
ram attribute clusterRevision default = 2;
2867+
callback attribute featureMap;
2868+
callback attribute clusterRevision;
28672869

28682870
handle command ArmFailSafe;
28692871
handle command ArmFailSafeResponse;
@@ -2904,8 +2906,8 @@ endpoint 0 {
29042906
callback attribute generatedCommandList;
29052907
callback attribute acceptedCommandList;
29062908
callback attribute attributeList;
2907-
ram attribute featureMap default = 0;
2908-
ram attribute clusterRevision default = 1;
2909+
callback attribute featureMap;
2910+
callback attribute clusterRevision;
29092911

29102912
handle command RetrieveLogsRequest;
29112913
handle command RetrieveLogsResponse;
@@ -3007,7 +3009,7 @@ endpoint 0 {
30073009
callback attribute acceptedCommandList;
30083010
callback attribute attributeList;
30093011
ram attribute featureMap default = 0x000F;
3010-
ram attribute clusterRevision default = 3;
3012+
callback attribute clusterRevision;
30113013

30123014
handle command ResetCounts;
30133015
}
@@ -3061,8 +3063,8 @@ endpoint 0 {
30613063
callback attribute generatedCommandList;
30623064
callback attribute acceptedCommandList;
30633065
callback attribute attributeList;
3064-
ram attribute featureMap default = 0;
3065-
ram attribute clusterRevision default = 1;
3066+
callback attribute featureMap;
3067+
callback attribute clusterRevision;
30663068

30673069
handle command AttestationRequest;
30683070
handle command AttestationResponse;
@@ -3116,13 +3118,13 @@ endpoint 1 {
31163118

31173119

31183120
server cluster Identify {
3119-
ram attribute identifyTime default = 0x0000;
3120-
ram attribute identifyType default = 0x0;
3121+
callback attribute identifyTime;
3122+
callback attribute identifyType;
31213123
callback attribute generatedCommandList;
31223124
callback attribute acceptedCommandList;
31233125
callback attribute attributeList;
3124-
ram attribute featureMap default = 0;
3125-
ram attribute clusterRevision default = 6;
3126+
callback attribute featureMap;
3127+
callback attribute clusterRevision;
31263128

31273129
handle command Identify;
31283130
}

0 commit comments

Comments
 (0)