Skip to content

Commit 17873a4

Browse files
author
Rafal Miecznik
committed
CI/CD: Synchronize ncs-aliro@0ea91e9205c9 and ncs-door-lock-app
Source commit ID: @0ea91e9205c9 sync-ncs-aliro-0ea91e9205c9 Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent a36474a commit 17873a4

55 files changed

Lines changed: 11032 additions & 1094 deletions

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: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ NCS manifest repo for the door lock reference application.
55

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

8-
Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
8+
Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
99

10-
- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
11-
- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
12-
- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
13-
- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
10+
- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
11+
- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
12+
- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
13+
- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
1414

1515
### Initialization
1616

@@ -23,6 +23,10 @@ Run the following commands:
2323
west init -m https://github.com/nrfconnect/ncs-door-lock-app --mr main door-lock-workspace
2424
```
2525

26+
> **NOTE**
27+
>
28+
> Before executing `west update` make sure that you have access to `ncs-aliro` private repository.
29+
2630
```shell
2731
# update nRF Connect SDK modules
2832
cd door-lock-workspace

app/boards/nrf5340dk_nrf5340_cpuapp.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/prj.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
6767
CONFIG_CHIP_DEVICE_DISCRIMINATOR=0xBBB
6868
CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE=30033003
6969

70-
# Configure ZAP file name
71-
CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH="${APPLICATION_CONFIG_DIR}/src/matter/default_zap/lock.zap"
72-
7370
# 32774 == 0x8006 (example lock-app)
7471
CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
7572

app/snippets/schedules/lock.matter

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,82 +1460,6 @@ cluster ThreadNetworkDiagnostics = 53 {
14601460
command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
14611461
}
14621462

1463-
/** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
1464-
cluster WiFiNetworkDiagnostics = 54 {
1465-
revision 1;
1466-
1467-
enum AssociationFailureCauseEnum : enum8 {
1468-
kUnknown = 0;
1469-
kAssociationFailed = 1;
1470-
kAuthenticationFailed = 2;
1471-
kSsidNotFound = 3;
1472-
}
1473-
1474-
enum ConnectionStatusEnum : enum8 {
1475-
kConnected = 0;
1476-
kNotConnected = 1;
1477-
}
1478-
1479-
enum SecurityTypeEnum : enum8 {
1480-
kUnspecified = 0;
1481-
kNone = 1;
1482-
kWEP = 2 [spec_name = "WEP"];
1483-
kWPA = 3 [spec_name = "WPA"];
1484-
kWPA2 = 4 [spec_name = "WPA2"];
1485-
kWPA3 = 5 [spec_name = "WPA3"];
1486-
}
1487-
1488-
enum WiFiVersionEnum : enum8 {
1489-
kA = 0;
1490-
kB = 1;
1491-
kG = 2;
1492-
kN = 3;
1493-
kAc = 4;
1494-
kAx = 5;
1495-
kAh = 6;
1496-
}
1497-
1498-
bitmap Feature : bitmap32 {
1499-
kPacketCounts = 0x1;
1500-
kErrorCounts = 0x2;
1501-
}
1502-
1503-
info event Disconnection = 0 {
1504-
int16u reasonCode = 0;
1505-
}
1506-
1507-
info event AssociationFailure = 1 {
1508-
AssociationFailureCauseEnum associationFailureCause = 0;
1509-
int16u status = 1;
1510-
}
1511-
1512-
info event ConnectionStatus = 2 {
1513-
ConnectionStatusEnum connectionStatus = 0;
1514-
}
1515-
1516-
readonly attribute nullable octet_string<6> bssid = 0;
1517-
readonly attribute nullable SecurityTypeEnum securityType = 1;
1518-
readonly attribute nullable WiFiVersionEnum wiFiVersion = 2;
1519-
readonly attribute nullable int16u channelNumber = 3;
1520-
readonly attribute nullable int8s rssi = 4;
1521-
readonly attribute optional nullable int32u beaconLostCount = 5;
1522-
readonly attribute optional nullable int32u beaconRxCount = 6;
1523-
readonly attribute optional nullable int32u packetMulticastRxCount = 7;
1524-
readonly attribute optional nullable int32u packetMulticastTxCount = 8;
1525-
readonly attribute optional nullable int32u packetUnicastRxCount = 9;
1526-
readonly attribute optional nullable int32u packetUnicastTxCount = 10;
1527-
readonly attribute optional nullable int64u currentMaxRate = 11;
1528-
readonly attribute optional nullable int64u overrunCount = 12;
1529-
readonly attribute command_id generatedCommandList[] = 65528;
1530-
readonly attribute command_id acceptedCommandList[] = 65529;
1531-
readonly attribute attrib_id attributeList[] = 65531;
1532-
readonly attribute bitmap32 featureMap = 65532;
1533-
readonly attribute int16u clusterRevision = 65533;
1534-
1535-
/** This command is used to reset the count attributes. */
1536-
command ResetCounts(): DefaultSuccess = 0;
1537-
}
1538-
15391463
/** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
15401464
cluster TimeSynchronization = 56 {
15411465
revision 2;
@@ -2958,7 +2882,6 @@ endpoint 0 {
29582882
callback attribute lastNetworkingStatus;
29592883
callback attribute lastNetworkID;
29602884
callback attribute lastConnectErrorValue;
2961-
callback attribute supportedWiFiBands;
29622885
callback attribute supportedThreadFeatures;
29632886
callback attribute threadVersion;
29642887
callback attribute generatedCommandList;
@@ -2969,7 +2892,6 @@ endpoint 0 {
29692892

29702893
handle command ScanNetworks;
29712894
handle command ScanNetworksResponse;
2972-
handle command AddOrUpdateWiFiNetwork;
29732895
handle command AddOrUpdateThreadNetwork;
29742896
handle command RemoveNetwork;
29752897
handle command NetworkConfigResponse;
@@ -3090,24 +3012,6 @@ endpoint 0 {
30903012
handle command ResetCounts;
30913013
}
30923014

3093-
server cluster WiFiNetworkDiagnostics {
3094-
callback attribute bssid;
3095-
callback attribute securityType;
3096-
callback attribute wiFiVersion;
3097-
callback attribute channelNumber;
3098-
callback attribute rssi;
3099-
callback attribute beaconRxCount;
3100-
callback attribute packetMulticastRxCount;
3101-
callback attribute packetMulticastTxCount;
3102-
callback attribute packetUnicastRxCount;
3103-
callback attribute packetUnicastTxCount;
3104-
callback attribute generatedCommandList;
3105-
callback attribute acceptedCommandList;
3106-
callback attribute attributeList;
3107-
ram attribute featureMap default = 1;
3108-
ram attribute clusterRevision default = 0x0001;
3109-
}
3110-
31113015
server cluster TimeSynchronization {
31123016
callback attribute UTCTime;
31133017
callback attribute granularity;

0 commit comments

Comments
 (0)