Skip to content

Commit 4704301

Browse files
gmarcosbgmarcosb
authored
Merge branch 'master' into camera-webrtc-server
2 parents 09f3559 + 078bc30 commit 4704301

File tree

128 files changed

+2439
-1238
lines changed

Some content is hidden

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

128 files changed

+2439
-1238
lines changed

‎.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ jobs:
496496
--target linux-x64-microwave-oven-ipv6only-no-ble-no-wifi-tsan-clang-test \
497497
--target linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test \
498498
--target linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test \
499-
--target linux-x64-fabric-admin-rpc-ipv6only-clang \
499+
--target linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang \
500500
--target linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang \
501501
--target linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang \
502502
--target linux-x64-python-bindings \
@@ -513,7 +513,7 @@ jobs:
513513
echo "CHIP_MICROWAVE_OVEN_APP: out/linux-x64-microwave-oven-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-microwave-oven-app" >> /tmp/test_env.yaml
514514
echo "CHIP_RVC_APP: out/linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-rvc-app" >> /tmp/test_env.yaml
515515
echo "NETWORK_MANAGEMENT_APP: out/linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test/matter-network-manager-app" >> /tmp/test_env.yaml
516-
echo "FABRIC_ADMIN_APP: out/linux-x64-fabric-admin-rpc-ipv6only-clang/fabric-admin" >> /tmp/test_env.yaml
516+
echo "FABRIC_ADMIN_APP: out/linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang/fabric-admin" >> /tmp/test_env.yaml
517517
echo "FABRIC_BRIDGE_APP: out/linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang/fabric-bridge-app" >> /tmp/test_env.yaml
518518
echo "LIGHTING_APP_NO_UNIQUE_ID: out/linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app" >> /tmp/test_env.yaml
519519
echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml

‎.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ default_args = {
3535

3636
# Required for pw_unit_test
3737
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
38-
pw_assert_BACKEND = "$dir_pw_assert_log"
39-
pw_log_BACKEND = "$dir_pw_log_basic"
38+
pw_assert_BACKEND = "//src/pw_backends/assert"
39+
pw_log_BACKEND = "//src/pw_backends/log"
4040

4141
# TODO: Make sure only unit tests link against this
4242
pw_build_LINK_DEPS = [

‎config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/pigweed.gni")
1717

18-
pw_log_BACKEND = "$dir_pw_log_basic"
19-
pw_assert_BACKEND = "$dir_pw_assert_log"
18+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
19+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2020
pw_sys_io_BACKEND =
2121
"${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io"
2222

‎config/efr32/lib/pw_rpc/pw_rpc.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/pigweed.gni")
1717

18-
pw_log_BACKEND = "$dir_pw_log_basic"
19-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
18+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
19+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2020
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2121
pw_sys_io_BACKEND =
2222
"${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs"

‎config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/pigweed.gni")
1717

18-
pw_log_BACKEND = "$dir_pw_log_basic"
19-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
18+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
19+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2020
pw_sys_io_BACKEND =
2121
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed"
2222
pw_rpc_system_server_BACKEND =

‎config/nxp/lib/pw_rpc/pw_rpc.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/pigweed.gni")
1717

18-
pw_log_BACKEND = "$dir_pw_log_basic"
19-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
18+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
19+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2020
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2121
pw_sys_io_BACKEND = "${chip_root}/examples/platform/nxp/pw_sys_io:pw_sys_io_nxp"
2222

‎config/qpg/lib/pw_rpc/pw_rpc.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/pigweed.gni")
1717

18-
pw_log_BACKEND = "$dir_pw_log_basic"
19-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
18+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
19+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2020
pw_sys_io_BACKEND = "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg"
2121

2222
pw_build_LINK_DEPS = [

‎examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <app-common/zap-generated/cluster-objects.h>
2020
#include <app-common/zap-generated/ids/Attributes.h>
2121
#include <app-common/zap-generated/ids/Clusters.h>
22-
#include <app/AttributeAccessInterface.h>
2322
#include <app/AttributeAccessInterfaceRegistry.h>
2423
#include <app/clusters/fan-control-server/fan-control-server.h>
2524
#include <app/util/attribute-storage.h>
@@ -34,13 +33,11 @@ using namespace chip::app::Clusters::FanControl::Attributes;
3433
using Protocols::InteractionModel::Status;
3534

3635
namespace {
37-
class FanControlManager : public AttributeAccessInterface, public Delegate
36+
class FanControlManager : public FanControlAttributeAccessInterface, public Delegate
3837
{
3938
public:
4039
// Register for the FanControl cluster on all endpoints.
41-
FanControlManager(EndpointId aEndpointId) :
42-
AttributeAccessInterface(Optional<EndpointId>(aEndpointId), FanControl::Id), Delegate(aEndpointId)
43-
{}
40+
FanControlManager(EndpointId aEndpointId) : FanControlAttributeAccessInterface(aEndpointId), Delegate(aEndpointId) {}
4441

4542
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
4643
Status HandleStep(StepDirectionEnum aDirection, bool aWrap, bool aLowestOff) override;

‎examples/all-clusters-app/linux/with_pw_rpc.gni

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")
2121

2222
import("//build_overrides/pigweed.gni")
2323

24-
pw_log_BACKEND = "$dir_pw_log_basic"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
24+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
25+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2626
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
2727
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
2828
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
@@ -39,4 +39,3 @@ pw_build_LINK_DEPS = [
3939
]
4040

4141
chip_enable_pw_rpc = true
42-
chip_use_pw_logging = true

‎examples/android/CHIPTest/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ shared_library("jni") {
3939
"${chip_root}/src/platform/android:java",
4040
"${chip_root}/src/platform/android:logging",
4141
"${chip_root}/src/platform/tests:tests",
42+
"${chip_root}/src/pw_backends/assert:assert.impl",
4243
"${chip_root}/third_party/inipp",
4344
"${chip_root}/third_party/nlfaultinjection:nlfaultinjection",
4445
]

‎examples/android/CHIPTest/args.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ chip_monolithic_tests = false
2828

2929
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
3030

31-
pw_assert_BACKEND = "$dir_pw_assert_log"
32-
pw_log_BACKEND = "$dir_pw_log_basic"
31+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
32+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
3333

3434
pw_unit_test_BACKEND = "$dir_pw_unit_test:light"
3535

‎examples/chef/linux/with_pw_rpc.gni

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")
2121

2222
import("//build_overrides/pigweed.gni")
2323

24-
pw_log_BACKEND = "$dir_pw_log_basic"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
24+
pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
25+
pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
2626
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
2727
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
2828
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
@@ -39,4 +39,3 @@ pw_build_LINK_DEPS = [
3939
]
4040

4141
chip_enable_pw_rpc = true
42-
chip_use_pw_logging = true

‎examples/common/pigweed/RpcService.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "pw_hdlc/decoder.h"
2626
#include "pw_hdlc/default_addresses.h"
2727
#include "pw_hdlc/rpc_channel.h"
28-
#include "pw_log/log.h"
2928
#include "pw_rpc/channel.h"
3029
#include "pw_status/status.h"
3130
#include "pw_stream/sys_io_stream.h"
@@ -96,20 +95,6 @@ void Start(void (*RegisterServices)(pw::rpc::Server &), ::chip::rpc::Mutex * uar
9695
PW_DASSERT(RegisterServices != nullptr);
9796
uart_mutex = uart_mutex_;
9897

99-
// Send log messages to HDLC address 1. This prevents logs from interfering
100-
// with pw_rpc communications.
101-
pw::log_basic::SetOutput([](std::string_view log) {
102-
if (uart_mutex)
103-
{
104-
uart_mutex->Lock();
105-
}
106-
pw::hdlc::WriteUIFrame(1, pw::as_bytes(pw::span(log)), sysIoWriter);
107-
if (uart_mutex)
108-
{
109-
uart_mutex->Unlock();
110-
}
111-
});
112-
11398
// Set up the server and start processing data.
11499
RegisterServices(server);
115100

‎examples/common/pigweed/rpc_console/py/chip_rpc/console.py

+2-16
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import argparse
4040
import sys
4141
from pathlib import Path
42-
from typing import Any, Collection
42+
from typing import Collection
4343

4444
import pw_system.console
4545
from pw_hdlc import rpc
@@ -52,7 +52,6 @@
5252
from button_service import button_service_pb2
5353
from descriptor_service import descriptor_service_pb2
5454
from device_service import device_service_pb2
55-
from echo_service import echo_pb2
5655
from fabric_admin_service import fabric_admin_service_pb2
5756
from fabric_bridge_service import fabric_bridge_service_pb2
5857
from lighting_service import lighting_service_pb2
@@ -72,13 +71,6 @@ def _parse_args():
7271
type=int,
7372
default=115200,
7473
help='the baud rate to use')
75-
parser.add_argument(
76-
'-o',
77-
'--output',
78-
type=argparse.FileType('wb'),
79-
default=sys.stdout.buffer,
80-
help=('The file to which to write device output (HDLC channel 1); '
81-
'provide - or omit for stdout.'))
8274
parser.add_argument(
8375
'-r',
8476
'--raw_serial',
@@ -99,7 +91,7 @@ def _parse_args():
9991

10092
def show_console(device: str, baudrate: int,
10193
token_databases: Collection[Path],
102-
socket_addr: str, output: Any, raw_serial: bool) -> int:
94+
socket_addr: str, raw_serial: bool) -> int:
10395

10496
# TODO: this shows a default console with little customization
10597
# Ideally we should at least customize the default messages
@@ -114,30 +106,24 @@ def show_console(device: str, baudrate: int,
114106
device=device,
115107
baudrate=baudrate,
116108
socket_addr=socket_addr,
117-
output=output,
118109
hdlc_encoding=not raw_serial,
119110
token_databases=token_databases,
120111
logfile="",
121112
device_logfile="",
122113
channel_id=rpc.DEFAULT_CHANNEL_ID,
123114

124115
# Defaults beyond the original console
125-
proto_globs=[],
126116
ticks_per_second=None,
127117
host_logfile="",
128118
json_logfile="",
129119
rpc_logging=False,
130-
# the pt-python based console seems to break on python 3.1 with
131-
# "set_wakeup_fd only works in main thread of the main interpreter"
132-
use_ipython=True,
133120
compiled_protos=[
134121
actions_service_pb2,
135122
attributes_service_pb2,
136123
boolean_state_service_pb2,
137124
button_service_pb2,
138125
descriptor_service_pb2,
139126
device_service_pb2,
140-
echo_pb2,
141127
fabric_admin_service_pb2,
142128
fabric_bridge_service_pb2,
143129
lighting_service_pb2,

‎examples/common/pigweed/system_rpc_server.cc

+1-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "pw_hdlc/decoder.h"
2121
#include "pw_hdlc/default_addresses.h"
2222
#include "pw_hdlc/rpc_channel.h"
23-
#include "pw_log/log.h"
2423
#include "pw_rpc_system_server/rpc_server.h"
2524
#include "pw_stream/sys_io_stream.h"
2625

@@ -40,12 +39,7 @@ rpc::Server server(channels);
4039

4140
} // namespace
4241

43-
void Init()
44-
{
45-
// Send log messages to HDLC address 1. This prevents logs from interfering
46-
// with pw_rpc communications.
47-
pw::log_basic::SetOutput([](std::string_view log) { pw::hdlc::WriteUIFrame(1, pw::as_bytes(pw::span(log)), writer); });
48-
}
42+
void Init() {}
4943

5044
rpc::Server & Server()
5145
{

‎examples/contact-sensor-app/nxp/common/AppTask.cpp

-16
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
#include "AppTask.h"
2020

21-
#if CONFIG_LOW_POWER
22-
#include "PWR_Interface.h"
23-
#endif
24-
2521
#include <app-common/zap-generated/attributes/Accessors.h>
2622
#include <platform/CHIPDeviceLayer.h>
2723

@@ -36,18 +32,6 @@ void ContactSensorApp::AppTask::PreInitMatterStack()
3632
ChipLogProgress(DeviceLayer, "Welcome to NXP Contact Sensor Demo App");
3733
}
3834

39-
#if CONFIG_LOW_POWER
40-
void ContactSensorApp::AppTask::AppMatter_DisallowDeviceToSleep()
41-
{
42-
PWR_DisallowDeviceToSleep();
43-
}
44-
45-
void ContactSensorApp::AppTask::AppMatter_AllowDeviceToSleep()
46-
{
47-
PWR_AllowDeviceToSleep();
48-
}
49-
#endif
50-
5135
ContactSensorApp::AppTask & ContactSensorApp::AppTask::GetDefaultInstance()
5236
{
5337
static ContactSensorApp::AppTask sAppTask;

‎examples/contact-sensor-app/nxp/common/include/AppTask.h

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ class AppTask : public chip::NXP::App::AppTaskFreeRTOS
3434

3535
// AppTaskFreeRTOS virtual methods
3636
void PreInitMatterStack() override;
37-
#if CONFIG_LOW_POWER
38-
void AppMatter_DisallowDeviceToSleep() override;
39-
void AppMatter_AllowDeviceToSleep() override;
40-
#endif
4137

4238
// This returns an instance of this class.
4339
static AppTask & GetDefaultInstance();

‎examples/fabric-admin/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ matter_log_json_payload_decode_full = true
3232
# make fabric-admin very strict by default
3333
chip_tlv_validate_char_string_on_read = true
3434
chip_tlv_validate_char_string_on_write = true
35-
chip_enable_ble = true

‎examples/fabric-admin/commands/fabric-sync/FabricSyncCommand.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ CHIP_ERROR FabricSyncAddBridgeCommand::RunCommand(NodeId remoteId)
8787
return CHIP_NO_ERROR;
8888
}
8989

90-
PairingManager::Instance().SetCommissioningDelegate(this);
90+
PairingManager::Instance().SetPairingDelegate(this);
9191

9292
mBridgeNodeId = remoteId;
9393

@@ -180,7 +180,7 @@ CHIP_ERROR FabricSyncAddLocalBridgeCommand::RunCommand(NodeId deviceId)
180180
return CHIP_NO_ERROR;
181181
}
182182

183-
PairingManager::Instance().SetCommissioningDelegate(this);
183+
PairingManager::Instance().SetPairingDelegate(this);
184184
mLocalBridgeNodeId = deviceId;
185185

186186
if (mSetupPINCode.HasValue())
@@ -252,7 +252,7 @@ void FabricSyncDeviceCommand::OnCommissioningWindowOpened(NodeId deviceId, CHIP_
252252
{
253253
NodeId nodeId = DeviceMgr().GetNextAvailableNodeId();
254254

255-
PairingManager::Instance().SetCommissioningDelegate(this);
255+
PairingManager::Instance().SetPairingDelegate(this);
256256
mAssignedNodeId = nodeId;
257257

258258
usleep(kCommissionPrepareTimeMs * 1000);

‎examples/fabric-admin/commands/fabric-sync/FabricSyncCommand.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace admin {
2626
// Constants
2727
constexpr uint32_t kCommissionPrepareTimeMs = 500;
2828

29-
class FabricSyncAddBridgeCommand : public CHIPCommand, public CommissioningDelegate
29+
class FabricSyncAddBridgeCommand : public CHIPCommand, public PairingDelegate
3030
{
3131
public:
3232
FabricSyncAddBridgeCommand(CredentialIssuerCommands * credIssuerCommands) : CHIPCommand("add-bridge", credIssuerCommands)
@@ -71,7 +71,7 @@ class FabricSyncRemoveBridgeCommand : public CHIPCommand, public PairingDelegate
7171
chip::NodeId mBridgeNodeId;
7272
};
7373

74-
class FabricSyncAddLocalBridgeCommand : public CHIPCommand, public CommissioningDelegate
74+
class FabricSyncAddLocalBridgeCommand : public CHIPCommand, public PairingDelegate
7575
{
7676
public:
7777
FabricSyncAddLocalBridgeCommand(CredentialIssuerCommands * credIssuerCommands) :
@@ -116,7 +116,7 @@ class FabricSyncRemoveLocalBridgeCommand : public CHIPCommand, public PairingDel
116116
chip::NodeId mLocalBridgeNodeId;
117117
};
118118

119-
class FabricSyncDeviceCommand : public CHIPCommand, public CommissioningWindowDelegate, public CommissioningDelegate
119+
class FabricSyncDeviceCommand : public CHIPCommand, public CommissioningWindowDelegate, public PairingDelegate
120120
{
121121
public:
122122
FabricSyncDeviceCommand(CredentialIssuerCommands * credIssuerCommands) : CHIPCommand("sync-device", credIssuerCommands)

0 commit comments

Comments
 (0)