Skip to content

Commit 11cc04c

Browse files
feasel0feasel0
authored
Merge branch 'master' into feature/unittest-transport-raw-tests
2 parents 811f3b0 + 040e5bf commit 11cc04c

File tree

223 files changed

+6587
-3486
lines changed

Some content is hidden

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

223 files changed

+6587
-3486
lines changed

‎.github/workflows/examples-linux-tv-casting-app.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: Test TV Casting Example
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323

@@ -63,6 +63,12 @@ jobs:
6363
./scripts/run_in_build_env.sh \
6464
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
6565
66+
- name: Test casting from Linux tv-casting-app to Linux tv-app
67+
run: |
68+
./scripts/run_in_build_env.sh \
69+
"python3 ./scripts/tests/run_tv_casting_test.py"
70+
timeout-minutes: 1
71+
6672
- name: Uploading Size Reports
6773
uses: ./.github/actions/upload-size-reports
6874
if: ${{ !env.ACT }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# Build System
1212
out/
13+
/examples/virtual-device-app/android/App/buildSrc/build/
1314
/src/test_driver/nrfconnect/build/
1415
/src/darwin/Framework/build/
1516

‎config/nrfconnect/app/enable-gnu-std.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
add_library(gnu17 INTERFACE)
22
target_compile_options(gnu17
33
INTERFACE
4-
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
5-
-D_SYS__PTHREADTYPES_H_)
4+
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
65
target_link_libraries(app PRIVATE gnu17)

‎config/nrfconnect/chip-module/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ else()
168168
endif()
169169

170170
if (CONFIG_CHIP_CRYPTO_PSA)
171-
matter_add_gn_arg_string("chip_crypto" "psa")
171+
matter_add_gn_arg_string("chip_crypto" "psa")
172+
matter_add_gn_arg_bool ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
172173
endif()
173174

174175
if (BOARD STREQUAL "native_posix")

‎config/nrfconnect/chip-module/Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -302,4 +302,9 @@ config CHIP_FACTORY_RESET_ON_KEY_MIGRATION_FAILURE
302302
Perform factory reset of the device if the operational key for Fabric has not been migrated
303303
properly to PSA ITS storage.
304304

305+
config CHIP_PERSISTENT_SUBSCRIPTIONS
306+
default n
307+
# selecting experimental for this feature since there is an issue with multiple controllers.
308+
select EXPERIMENTAL
309+
305310
endif # CHIP

‎config/nrfconnect/chip-module/Kconfig.defaults

+9-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ if CHIP
2424
# System configuration
2525
# ==============================================================================
2626

27+
choice LIBC_IMPLEMENTATION
28+
default NEWLIB_LIBC
29+
endchoice
30+
2731
config ASSERT
2832
default y
2933

@@ -298,6 +302,7 @@ config MBEDTLS_HEAP_SIZE
298302

299303
config CHIP_CRYPTO_PSA
300304
default y if !CHIP_WIFI
305+
imply PSA_WANT_ALG_SPAKE2P_MATTER
301306

302307
if CHIP_CRYPTO_PSA
303308

@@ -317,13 +322,13 @@ if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
317322
config PSA_USE_CC3XX_HASH_DRIVER
318323
default n
319324

320-
endif
325+
endif # PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
321326

322327
# Spake2+ support
323328
config MBEDTLS_MD_C
324329
default y
325330

326-
endif
331+
endif # CHIP_CRYPTO_PSA
327332

328333
if !CHIP_CRYPTO_PSA
329334

@@ -366,7 +371,7 @@ config MBEDTLS_ECP_C
366371
config MBEDTLS_ECP_DP_SECP256R1_ENABLED
367372
default y
368373

369-
endif
374+
endif # !CHIP_CRYPTO_PSA
370375

371376
config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
372377
default n if CHIP_WIFI
@@ -486,4 +491,4 @@ config OPENTHREAD_SHELL
486491

487492
endif # SHELL
488493

489-
endif
494+
endif # CHIP

‎config/nrfconnect/chip-module/Kconfig.features

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,13 @@ config CHIP_WIFI
4242

4343
config CHIP_QSPI_NOR
4444
bool "Enable QSPI NOR feature set"
45+
imply NORDIC_QSPI_NOR
4546
help
4647
Enables QSPI NOR flash with a set of options for configuring pages and
4748
buffer sizes.
4849

4950
if CHIP_QSPI_NOR
5051

51-
config NORDIC_QSPI_NOR
52-
default y
53-
5452
config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE
5553
default 16
5654

‎config/nrfconnect/chip-module/Kconfig.mcuboot.defaults

+1-16
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@
1919
config MAIN_STACK_SIZE
2020
default 10240
2121

22-
config BOOT_SWAP_SAVE_ENCTLV
23-
default n
24-
25-
config BOOT_ENCRYPT_RSA
26-
default n
27-
28-
config BOOT_ENCRYPT_EC256
29-
default n
30-
31-
config BOOT_ENCRYPT_X25519
22+
config BOOT_ENCRYPT_IMAGE
3223
default n
3324

3425
config BOOT_BOOTSTRAP
@@ -53,9 +44,6 @@ if BOARD_NRF7002DK_NRF5340_CPUAPP
5344
config SPI
5445
default y
5546

56-
config SPI_NOR
57-
default y
58-
5947
choice SPI_NOR_SFDP
6048
default SPI_NOR_SFDP_DEVICETREE
6149
endchoice
@@ -74,9 +62,6 @@ endif
7462
# All boards beside nRF7002DK use QSPI NOR external flash
7563
if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
7664

77-
config NORDIC_QSPI_NOR
78-
default y
79-
8065
config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
8166
default 4096
8267

‎config/zephyr/Kconfig

+5-2
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ config CHIP_PROJECT_CONFIG
309309

310310
config CHIP_ENABLE_DNSSD_SRP
311311
bool "OpenThread Service Registration Protocol"
312-
default y if NET_L2_OPENTHREAD
312+
default y
313+
depends on NET_L2_OPENTHREAD
313314
imply OPENTHREAD_ECDSA
314315
imply OPENTHREAD_SRP_CLIENT
315316
help
@@ -318,7 +319,8 @@ config CHIP_ENABLE_DNSSD_SRP
318319

319320
config CHIP_ENABLE_DNS_CLIENT
320321
bool "OpenThread DNS client"
321-
default y if NET_L2_OPENTHREAD
322+
default y
323+
depends on NET_L2_OPENTHREAD
322324
imply OPENTHREAD_DNS_CLIENT
323325
help
324326
Enables using the OpenThread DNS client for the Matter service discovery.
@@ -413,6 +415,7 @@ config CHIP_THREAD_SSED
413415

414416
config CHIP_OPENTHREAD_CONFIG
415417
string "Custom OpenThread configuration file"
418+
depends on NET_L2_OPENTHREAD
416419
help
417420
Provides a path to an OpenThread configuration file. The path can be
418421
either absolute or relative to the application directory. When this option

‎examples/chef/common/clusters/door-lock/chef-lock-manager.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
#include <iostream>
1918
#include <lib/support/logging/CHIPLogging.h>
2019

2120
#ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER
2221
#include "chef-lock-manager.h"
2322

23+
#include <algorithm>
24+
#include <iostream>
25+
2426
using chip::to_underlying;
2527

2628
LockManager LockManager::instance;

‎examples/chef/common/clusters/door-lock/chef-lock-manager.h

+2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include "chef-lock-endpoint.h"
2222
#include <app/clusters/door-lock-server/door-lock-server.h>
23+
2324
#include <cstdint>
25+
#include <vector>
2426

2527
class LockManager
2628
{

‎examples/chef/common/clusters/target-navigator/TargetNavigatorManager.h

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <app/clusters/target-navigator-server/target-navigator-server.h>
2121

22+
#include <list>
2223
#include <string>
2324

2425
class TargetNavigatorManager : public chip::app::Clusters::TargetNavigator::Delegate

‎examples/chef/esp32/main/QRCodeScreen.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4444

4545
#include <string>
46+
#include <vector>
4647

4748
// TODO need sensible library tag when put in library
4849
extern const char TAG[];

‎examples/chip-tool/commands/common/DeviceScanner.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ CHIP_ERROR DeviceScanner::Stop()
5555

5656
void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
5757
{
58-
auto & commissionData = nodeData.nodeData;
58+
VerifyOrReturn(nodeData.Is<CommissionNodeData>());
59+
auto & commissionData = nodeData.Get<CommissionNodeData>();
5960

6061
auto discriminator = commissionData.longDiscriminator;
6162
auto vendorId = static_cast<VendorId>(commissionData.vendorId);
@@ -64,7 +65,7 @@ void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
6465
ChipLogProgress(chipTool, "OnNodeDiscovered (MDNS): discriminator: %u, vendorId: %u, productId: %u", discriminator, vendorId,
6566
productId);
6667

67-
auto & resolutionData = nodeData.resolutionData;
68+
const CommonResolutionData & resolutionData = commissionData;
6869

6970
auto & instanceData = mDiscoveredResults[commissionData.instanceName];
7071
auto & interfaceData = instanceData[resolutionData.interfaceId.GetPlatformInterface()];
@@ -76,7 +77,7 @@ void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
7677
interfaceData.push_back(result);
7778
}
7879

79-
nodeData.LogDetail();
80+
commissionData.LogDetail();
8081
}
8182

8283
void DeviceScanner::OnBrowseAdd(chip::Dnssd::DnssdService service)

‎examples/chip-tool/commands/common/RemoteDataModelLogger.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ CHIP_ERROR LogIssueNOCChain(const char * noc, const char * icac, const char * rc
204204
return gDelegate->LogJSON(valueStr.c_str());
205205
}
206206

207-
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeData)
207+
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::CommissionNodeData & nodeData)
208208
{
209209
VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
210210

211-
auto & resolutionData = nodeData.resolutionData;
212-
auto & commissionData = nodeData.nodeData;
211+
auto & commissionData = nodeData;
212+
auto & resolutionData = commissionData;
213213

214214
if (!chip::CanCastTo<uint8_t>(resolutionData.numIPs))
215215
{
@@ -245,24 +245,24 @@ CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeDat
245245
value["port"] = resolutionData.port;
246246
value["numIPs"] = static_cast<uint8_t>(resolutionData.numIPs);
247247

248-
if (resolutionData.mrpRetryIntervalIdle.HasValue())
248+
if (resolutionData.mrpRetryIntervalIdle.has_value())
249249
{
250-
value["mrpRetryIntervalIdle"] = resolutionData.mrpRetryIntervalIdle.Value().count();
250+
value["mrpRetryIntervalIdle"] = resolutionData.mrpRetryIntervalIdle->count();
251251
}
252252

253-
if (resolutionData.mrpRetryIntervalActive.HasValue())
253+
if (resolutionData.mrpRetryIntervalActive.has_value())
254254
{
255-
value["mrpRetryIntervalActive"] = resolutionData.mrpRetryIntervalActive.Value().count();
255+
value["mrpRetryIntervalActive"] = resolutionData.mrpRetryIntervalActive->count();
256256
}
257257

258-
if (resolutionData.mrpRetryActiveThreshold.HasValue())
258+
if (resolutionData.mrpRetryActiveThreshold.has_value())
259259
{
260-
value["mrpRetryActiveThreshold"] = resolutionData.mrpRetryActiveThreshold.Value().count();
260+
value["mrpRetryActiveThreshold"] = resolutionData.mrpRetryActiveThreshold->count();
261261
}
262262

263-
if (resolutionData.isICDOperatingAsLIT.HasValue())
263+
if (resolutionData.isICDOperatingAsLIT.has_value())
264264
{
265-
value["isICDOperatingAsLIT"] = resolutionData.isICDOperatingAsLIT.Value();
265+
value["isICDOperatingAsLIT"] = *(resolutionData.isICDOperatingAsLIT);
266266
}
267267

268268
Json::Value rootValue;

‎examples/chip-tool/commands/common/RemoteDataModelLogger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error);
4343
CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value);
4444
CHIP_ERROR LogGetCommissionerRootCertificate(const char * value);
4545
CHIP_ERROR LogIssueNOCChain(const char * noc, const char * icac, const char * rcac, const char * ipk);
46-
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeData);
46+
CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::CommissionNodeData & nodeData);
4747
void SetDelegate(RemoteDataModelLoggerDelegate * delegate);
4848
}; // namespace RemoteDataModelLogger

‎examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
using namespace ::chip;
2525

26-
void DiscoverCommissionablesCommandBase::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
26+
void DiscoverCommissionablesCommandBase::OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData)
2727
{
2828
nodeData.LogDetail();
2929
LogErrorOnFailure(RemoteDataModelLogger::LogDiscoveredNodeData(nodeData));

‎examples/chip-tool/commands/discover/DiscoverCommissionablesCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DiscoverCommissionablesCommandBase : public CHIPCommand, public chip::Cont
3131
}
3232

3333
/////////// DeviceDiscoveryDelegate Interface /////////
34-
void OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
34+
void OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData) override;
3535

3636
/////////// CHIPCommand Interface /////////
3737
chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(30); }

‎examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void DiscoverCommissionersCommand::Shutdown()
3232
[[maybe_unused]] int commissionerCount = 0;
3333
for (int i = 0; i < CHIP_DEVICE_CONFIG_MAX_DISCOVERED_NODES; i++)
3434
{
35-
const Dnssd::DiscoveredNodeData * commissioner = mCommissionableNodeController.GetDiscoveredCommissioner(i);
35+
const Dnssd::CommissionNodeData * commissioner = mCommissionableNodeController.GetDiscoveredCommissioner(i);
3636
if (commissioner != nullptr)
3737
{
3838
ChipLogProgress(chipTool, "Discovered Commissioner #%d", commissionerCount);

‎examples/chip-tool/commands/pairing/PairingCommand.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,12 +479,12 @@ void PairingCommand::OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedA
479479
ChipLogValueX64(deviceId), promisedActiveDuration);
480480
}
481481

482-
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
482+
void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData)
483483
{
484484
// Ignore nodes with closed commissioning window
485-
VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
485+
VerifyOrReturn(nodeData.commissioningMode != 0);
486486

487-
auto & resolutionData = nodeData.resolutionData;
487+
auto & resolutionData = nodeData;
488488

489489
const uint16_t port = resolutionData.port;
490490
char buf[chip::Inet::IPAddress::kMaxStringLength];

‎examples/chip-tool/commands/pairing/PairingCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class PairingCommand : public CHIPCommand,
201201
void OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedActiveDuration) override;
202202

203203
/////////// DeviceDiscoveryDelegate Interface /////////
204-
void OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
204+
void OnDiscoveredDevice(const chip::Dnssd::CommissionNodeData & nodeData) override;
205205

206206
/////////// DeviceAttestationDelegate /////////
207207
chip::Optional<uint16_t> FailSafeExpiryTimeoutSecs() const override;

‎examples/common/websocket-server/WebSocketServer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ CHIP_ERROR WebSocketServer::Run(chip::Optional<uint16_t> port, WebSocketServerDe
178178
info.protocols = protocols;
179179
static const lws_retry_bo_t retry = {
180180
.secs_since_valid_ping = 400,
181-
.secs_since_valid_hangup = 400,
181+
.secs_since_valid_hangup = 420,
182182
};
183183
info.retry_and_idle_policy = &retry;
184184

‎examples/contact-sensor-app/nxp/k32w/k32w0/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -559,10 +559,10 @@ This is the list of all supported partitions:
559559
00 -----------------> 0x00 Bootable flag
560560
00 -----------------> 0x00 Image type (0x00 = SSBL)
561561
562-
004000000f020101: Application partition
562+
00400000c9040101: Application partition
563563
564564
00400000 -----------> 0x00004000 Start Address
565-
0f02 ---------------> 0x020f Number of 512-bytes pages
565+
c904 ---------------> 0x04c9 Number of 512-bytes pages
566566
01 -----------------> 0x01 Bootable flag
567567
01 -----------------> 0x01 Image type (0x01 = Application)
568568

0 commit comments

Comments
 (0)